[Bf-blender-cvs] [2be20e9ece5] master: Cleanup/CMake: Fix superfluous warning of WITH_BOOST being turned off
Ray Molenkamp
noreply at git.blender.org
Sun Feb 9 01:17:33 CET 2020
Commit: 2be20e9ece53ee9af4ad5c14f32e38afd8d25dad
Author: Ray Molenkamp
Date: Sat Feb 8 17:17:28 2020 -0700
Branches: master
https://developer.blender.org/rB2be20e9ece53ee9af4ad5c14f32e38afd8d25dad
Cleanup/CMake: Fix superfluous warning of WITH_BOOST being turned off
The check for turning boost off did not actually check if WITH_BOOST
was on to start with leading to a superfluous warning during configuration.
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60656a9e4fa..820fea6982c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -621,7 +621,7 @@ set_and_warn_dependency(WITH_BOOST WITH_OPENCOLORIO OFF)
set_and_warn_dependency(WITH_BOOST WITH_QUADRIFLOW OFF)
set_and_warn_dependency(WITH_BOOST WITH_USD OFF)
-if(NOT (WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR
+if(WITH_BOOST AND NOT (WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR
WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_USD))
message(STATUS "No dependencies need 'WITH_BOOST' forcing WITH_BOOST=OFF")
set(WITH_BOOST OFF)
More information about the Bf-blender-cvs
mailing list