[Bf-blender-cvs] [14d7cd46ba6] master: Fix CMake configuration error with Cycles enabled and Boost diabled
Brecht Van Lommel
noreply at git.blender.org
Wed Jan 4 14:48:25 CET 2023
Commit: 14d7cd46ba60f1f7f08ec3e4af2ecf53bdba5720
Author: Brecht Van Lommel
Date: Wed Jan 4 14:32:29 2023 +0100
Branches: master
https://developer.blender.org/rB14d7cd46ba60f1f7f08ec3e4af2ecf53bdba5720
Fix CMake configuration error with Cycles enabled and Boost diabled
This is now only an indirect dependency on shared libraries, which means
this combination is valid.
Also remove mechanism that automatically disabled WITH_BOOST if no libraries
are using it, this is no longer really helpful with shared boost libraries.
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3e9eb55c15..76779726e21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -837,15 +837,10 @@ set_and_warn_dependency(WITH_BOOST WITH_OPENVDB OFF)
set_and_warn_dependency(WITH_BOOST WITH_QUADRIFLOW OFF)
set_and_warn_dependency(WITH_BOOST WITH_USD OFF)
if(WITH_CYCLES)
+ set_and_warn_dependency(WITH_BOOST WITH_CYCLES_OSL OFF)
set_and_warn_dependency(WITH_PUGIXML WITH_CYCLES_OSL OFF)
endif()
-if(WITH_BOOST AND NOT (WITH_INTERNATIONAL OR WITH_OPENVDB OR
- WITH_QUADRIFOLOW OR WITH_USD))
- message(STATUS "No dependencies need 'WITH_BOOST' forcing WITH_BOOST=OFF")
- set(WITH_BOOST OFF)
-endif()
-
set_and_warn_dependency(WITH_TBB WITH_CYCLES OFF)
set_and_warn_dependency(WITH_TBB WITH_USD OFF)
set_and_warn_dependency(WITH_TBB WITH_OPENVDB OFF)
@@ -1075,14 +1070,6 @@ if(WITH_CYCLES)
"Configure OIIO or disable WITH_CYCLES"
)
endif()
- if(NOT WITH_BOOST)
- message(
- FATAL_ERROR
- "Cycles requires WITH_BOOST, the library may not have been found. "
- "Configure BOOST or disable WITH_CYCLES"
- )
- endif()
-
if(WITH_CYCLES_OSL)
if(NOT WITH_LLVM)
message(
More information about the Bf-blender-cvs
mailing list