[Bf-blender-cvs] [cbb498c] master: CMake: Corrections around disabling Boost

[Sergey Sharybin]

Commit: cbb498cfb0b8794ec0095b9471e1fe708a2d6322
Author: Sergey Sharybin
Date:   Tue Jan 26 15:41:06 2016 +0100
Branches: master
https://developer.blender.org/rBcbb498cfb0b8794ec0095b9471e1fe708a2d6322

CMake: Corrections around disabling Boost

Were some missing dependencies in the checks.

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cac2d00..bda0d17 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -680,10 +680,13 @@ if(NOT WITH_BOOST)
 	set_and_warn(WITH_AUDASPACE      OFF)
 	set_and_warn(WITH_INTERNATIONAL  OFF)
 	set_and_warn(WITH_OPENVDB        OFF)
+	set_and_warn(WITH_OPENCOLORIO    OFF)
+	set_and_warn(WITH_MOD_BOOLEAN    OFF)
 
 	set_and_warn(WITH_OPENAL         OFF)  # depends on AUDASPACE
 	set_and_warn(WITH_GAMEENGINE     OFF)  # depends on AUDASPACE
-elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_INTERNATIONAL OR WITH_OPENVDB)
+	set_and_warn(WITH_PLAYER         OFF)  # depends on AUDASPACE
+elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_INTERNATIONAL OR WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_MOD_BOOLEAN)
 	# Keep enabled
 else()
 	# Enabled but we don't need it