[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54244] trunk/blender/CMakeLists.txt: expose WITH_BOOST as a cmake option, this just disables boost deps since it was becoming annoying to remember all of them .
Campbell Barton
ideasman42 at gmail.com
Fri Feb 1 00:25:14 CET 2013
Revision: 54244
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54244
Author: campbellbarton
Date: 2013-01-31 23:25:06 +0000 (Thu, 31 Jan 2013)
Log Message:
-----------
expose WITH_BOOST as a cmake option, this just disables boost deps since it was becoming annoying to remember all of them.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-01-31 22:18:37 UTC (rev 54243)
+++ trunk/blender/CMakeLists.txt 2013-01-31 23:25:06 UTC (rev 54244)
@@ -269,6 +269,9 @@
option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
mark_as_advanced(WITH_ASSERT_ABORT)
+option(WITH_BOOST "Enable features depending no boost" ON)
+
+
if(APPLE)
cmake_minimum_required(VERSION 2.8.8)
cmake_policy(VERSION 2.8.8)
@@ -396,9 +399,22 @@
set(WITH_OPENIMAGEIO ON)
endif()
-# auto enable boost for cycles, booleans, audaspace or i18n
-if(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
- set(WITH_BOOST ON)
+# enable boost for cycles, booleans, audaspace or i18n
+# otherwise if the user disabled
+if(NOT WITH_BOOST)
+ # Explicitly disabled. so disable all deps.
+ set(WITH_CYCLES OFF)
+ set(WITH_MOD_BOOLEAN OFF)
+ set(WITH_AUDASPACE OFF)
+ set(WITH_INTERNATIONAL OFF)
+
+ set(WITH_OPENAL OFF) # depends on AUDASPACE
+ set(WITH_GAMEENGINE OFF) # depends on AUDASPACE
+elseif(WITH_CYCLES OR WITH_MOD_BOOLEAN OR WITH_AUDASPACE OR WITH_INTERNATIONAL)
+ # Keep enabled
+else()
+ # Enabled but we don't need it
+ set(WITH_BOOST OFF)
endif()
# auto enable llvm for cycles_osl
@@ -2184,12 +2200,10 @@
info_cfg_option(WITH_MOD_FLUID)
info_cfg_option(WITH_MOD_OCEANSIM)
+ # debug
+ message(STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}")
+
info_cfg_text("")
message("${_config_msg}")
endif()
-
-# debug
-message(
- STATUS "HAVE_STDBOOL_H = ${HAVE_STDBOOL_H}"
-)
More information about the Bf-blender-cvs
mailing list