[Bf-blender-cvs] [abe4c38] blender-v2.78-release: [cmake/cpack] allow override of package name

lazydodo noreply at git.blender.org
Wed Sep 14 10:38:30 CEST 2016


Commit: abe4c384100fad370a0add55b5225d1dabcf85a1
Author: lazydodo
Date:   Tue Sep 6 07:21:23 2016 -0600
Branches: blender-v2.78-release
https://developer.blender.org/rBabe4c384100fad370a0add55b5225d1dabcf85a1

[cmake/cpack] allow override of package name

Cpack generates a standard filename with git information in it, which might not always be wanted for release builds, this patch adds an option to override that default filename.

Reviewers: sergey, juicyfruit

Reviewed By: juicyfruit

Differential Revision: https://developer.blender.org/D2199

ammended to fix: wrong variable name in main CMakeLists.txt

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f7d59a..352712e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -220,8 +220,8 @@ if(${CMAKE_VERSION} VERSION_LESS 2.8.8)
 endif()
 set(BUILDINFO_OVERRIDE_DATE "" CACHE STRING "Use instead of the current date for reproducable builds (empty string disables this option)")
 set(BUILDINFO_OVERRIDE_TIME "" CACHE STRING "Use instead of the current time for reproducable builds (empty string disables this option)")
-set(PACKAGENAME_OVERRIDE "" CACHE STRING "Use instead of the standard packagename (empty string disables this option)")
-mark_as_advanced(PACKAGENAME_OVERRIDE)
+set(CPACK_OVERRIDE_PACKAGENAME "" CACHE STRING "Use instead of the standard packagename (empty string disables this option)")
+mark_as_advanced(CPACK_OVERRIDE_PACKAGENAME)
 mark_as_advanced(BUILDINFO_OVERRIDE_DATE)
 mark_as_advanced(BUILDINFO_OVERRIDE_TIME)




More information about the Bf-blender-cvs mailing list