diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-02-01 03:25:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-02-01 03:25:06 +0400 |
| commit | a2543d417313814993f62574d0d0c19c9d411975 (patch) | |
| tree | d6fe1f50f3a05d4e3dd28c6b5a371c37c6972b5e /CMakeLists.txt | |
| parent | c734808fb0422339341a3567bea90498b4046e9d (diff) | |
expose WITH_BOOST as a cmake option, this just disables boost deps since it was becoming annoying to remember all of them.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f5bca0a071f..ace3803e0d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -269,6 +269,9 @@ mark_as_advanced(WITH_CXX_GUARDEDALLOC) 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 @@ if(WITH_CYCLES) 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 @@ if(FIRST_RUN) 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}" -) |