[Bf-blender-cvs] [3d70a04] master: CMake: remove temp assignment, unused vars
Campbell Barton
noreply at git.blender.org
Tue May 19 08:45:28 CEST 2015
Commit: 3d70a04a8ae439560795e4b3e530585841798b9d
Author: Campbell Barton
Date: Tue May 19 16:26:03 2015 +1000
Branches: master
https://developer.blender.org/rB3d70a04a8ae439560795e4b3e530585841798b9d
CMake: remove temp assignment, unused vars
===================================================================
M CMakeLists.txt
M build_files/cmake/packaging.cmake
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8b32b4..9d41c49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,7 +197,6 @@ option(WITH_PYTHON "Enable Embedded Python API (only disable for develop
option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default" ON)
mark_as_advanced(WITH_PYTHON) # dont want people disabling this unless they really know what they are doing.
mark_as_advanced(WITH_PYTHON_SECURITY) # some distributions see this as a security issue, rather than have them patch it, make a build option.
-set(WITH_PYTHON_SECURITY ON CACHE BOOL "ON" FORCE) # temp force on.
option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
mark_as_advanced(WITH_PYTHON_SAFETY)
diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index f0dd048..0cb13e0 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -112,3 +112,9 @@ elseif(UNIX)
"tar.bz2")
endif()
+unset(MAJOR_VERSION)
+unset(MINOR_VERSION)
+unset(PATCH_VERSION)
+
+unset(BUILD_REV)
+
More information about the Bf-blender-cvs
mailing list