[Bf-blender-cvs] [30d6589] master: CMake: mark lib/debug options advanced
Campbell Barton
noreply at git.blender.org
Thu Mar 5 05:50:51 CET 2015
Commit: 30d6589069ccf993ca22e3a8ed2226d9396734f0
Author: Campbell Barton
Date: Thu Mar 5 15:23:22 2015 +1100
Branches: master
https://developer.blender.org/rB30d6589069ccf993ca22e3a8ed2226d9396734f0
CMake: mark lib/debug options advanced
===================================================================
M CMakeLists.txt
M build_files/cmake/Modules/FindOpenGLES.cmake
M build_files/cmake/Modules/FindOpenImageIO.cmake
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3fb958..0809a2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,6 +200,7 @@ mark_as_advanced(WITH_PYTHON_SECURITY) # some distributions see this as a secur
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)
option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
if(APPLE)
option(WITH_PYTHON_FRAMEWORK "Enable building using the Python available in the framework (OSX only)" OFF)
diff --git a/build_files/cmake/Modules/FindOpenGLES.cmake b/build_files/cmake/Modules/FindOpenGLES.cmake
index 9efb940..e3484d2 100644
--- a/build_files/cmake/Modules/FindOpenGLES.cmake
+++ b/build_files/cmake/Modules/FindOpenGLES.cmake
@@ -71,6 +71,7 @@ ENDIF()
MARK_AS_ADVANCED(
OPENGLES_EGL_INCLUDE_DIR
OPENGLES_EGL_LIBRARY
+ OPENGLES_LIBRARY
OPENGLES_INCLUDE_DIR
)
diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake
index 6b82c9d..5e454b6 100644
--- a/build_files/cmake/Modules/FindOpenImageIO.cmake
+++ b/build_files/cmake/Modules/FindOpenImageIO.cmake
@@ -83,6 +83,7 @@ ENDIF()
MARK_AS_ADVANCED(
OPENIMAGEIO_INCLUDE_DIR
OPENIMAGEIO_LIBRARY
+ OPENIMAGEIO_IDIFF
)
UNSET(_openimageio_SEARCH_DIRS)
More information about the Bf-blender-cvs
mailing list