From 13af88b23f70a26cad26556ab70a9adb6f6191c0 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 7 Dec 2021 18:31:36 +0100 Subject: Build: clean up handling of some Cycles build options * Don't link embree / OSL when WITH_CYCLES is disabled * Simplify lite config by disabling Cycles as a whole using this * Remove code handling the removed WITH_CYCLES_NETWORK option --- build_files/cmake/config/blender_lite.cmake | 3 --- build_files/cmake/platform/platform_apple.cmake | 7 ++----- build_files/cmake/platform/platform_unix.cmake | 9 +++------ build_files/cmake/platform/platform_win32.cmake | 8 ++++---- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 89bd46ecd7d..d7ba48050eb 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -19,9 +19,6 @@ set(WITH_CODEC_SNDFILE OFF CACHE BOOL "" FORCE) set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE) set(WITH_COREAUDIO OFF CACHE BOOL "" FORCE) set(WITH_CYCLES OFF CACHE BOOL "" FORCE) -set(WITH_CYCLES_DEVICE_OPTIX OFF CACHE BOOL "" FORCE) -set(WITH_CYCLES_EMBREE OFF CACHE BOOL "" FORCE) -set(WITH_CYCLES_OSL OFF CACHE BOOL "" FORCE) set(WITH_DRACO OFF CACHE BOOL "" FORCE) set(WITH_FFTW3 OFF CACHE BOOL "" FORCE) set(WITH_FREESTYLE OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 2bfdc84ec2a..15bd02230c3 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -257,9 +257,6 @@ if(WITH_BOOST) if(WITH_INTERNATIONAL) list(APPEND _boost_FIND_COMPONENTS locale) endif() - if(WITH_CYCLES_NETWORK) - list(APPEND _boost_FIND_COMPONENTS serialization) - endif() if(WITH_OPENVDB) list(APPEND _boost_FIND_COMPONENTS iostreams) endif() @@ -339,7 +336,7 @@ if(WITH_LLVM) endif() -if(WITH_CYCLES_OSL) +if(WITH_CYCLES AND WITH_CYCLES_OSL) set(CYCLES_OSL ${LIBDIR}/osl) find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib) @@ -359,7 +356,7 @@ if(WITH_CYCLES_OSL) endif() endif() -if(WITH_CYCLES_EMBREE) +if(WITH_CYCLES AND WITH_CYCLES_EMBREE) find_package(Embree 3.8.0 REQUIRED) # Increase stack size for Embree, only works for executables. if(NOT WITH_PYTHON_MODULE) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index fc0c37e4c8b..2f1a622c63d 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -241,7 +241,7 @@ if(WITH_INPUT_NDOF) endif() endif() -if(WITH_CYCLES_OSL) +if(WITH_CYCLES AND WITH_CYCLES_OSL) set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation") if(EXISTS ${CYCLES_OSL} AND NOT OSL_ROOT) set(OSL_ROOT ${CYCLES_OSL}) @@ -314,7 +314,7 @@ if(WITH_BOOST) endif() set(Boost_USE_MULTITHREADED ON) set(__boost_packages filesystem regex thread date_time) - if(WITH_CYCLES_OSL) + if(WITH_CYCLES AND WITH_CYCLES_OSL) if(NOT (${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6")) list(APPEND __boost_packages wave) else() @@ -323,9 +323,6 @@ if(WITH_BOOST) if(WITH_INTERNATIONAL) list(APPEND __boost_packages locale) endif() - if(WITH_CYCLES_NETWORK) - list(APPEND __boost_packages serialization) - endif() if(WITH_OPENVDB) list(APPEND __boost_packages iostreams) endif() @@ -403,7 +400,7 @@ if(WITH_OPENCOLORIO) endif() endif() -if(WITH_CYCLES_EMBREE) +if(WITH_CYCLES AND WITH_CYCLES_EMBREE) find_package(Embree 3.8.0 REQUIRED) endif() diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index e83eba74fc0..851dafc34fb 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -477,7 +477,7 @@ if(WITH_PYTHON) endif() if(WITH_BOOST) - if(WITH_CYCLES_OSL) + if(WITH_CYCLES AND WITH_CYCLES_OSL) set(boost_extra_libs wave) endif() if(WITH_INTERNATIONAL) @@ -520,7 +520,7 @@ if(WITH_BOOST) debug ${BOOST_LIBPATH}/libboost_thread-${BOOST_DEBUG_POSTFIX} debug ${BOOST_LIBPATH}/libboost_chrono-${BOOST_DEBUG_POSTFIX} ) - if(WITH_CYCLES_OSL) + if(WITH_CYCLES AND WITH_CYCLES_OSL) set(BOOST_LIBRARIES ${BOOST_LIBRARIES} optimized ${BOOST_LIBPATH}/libboost_wave-${BOOST_POSTFIX} debug ${BOOST_LIBPATH}/libboost_wave-${BOOST_DEBUG_POSTFIX}) @@ -708,7 +708,7 @@ if(WITH_CODEC_SNDFILE) set(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBPATH}/libsndfile-1.lib) endif() -if(WITH_CYCLES_OSL) +if(WITH_CYCLES AND WITH_CYCLES_OSL) set(CYCLES_OSL ${LIBDIR}/osl CACHE PATH "Path to OpenShadingLanguage installation") set(OSL_SHADER_DIR ${CYCLES_OSL}/shaders) # Shaders have moved around a bit between OSL versions, check multiple locations @@ -741,7 +741,7 @@ if(WITH_CYCLES_OSL) endif() endif() -if(WITH_CYCLES_EMBREE) +if(WITH_CYCLES AND WITH_CYCLES_EMBREE) windows_find_package(Embree) if(NOT EMBREE_FOUND) set(EMBREE_INCLUDE_DIRS ${LIBDIR}/embree/include) -- cgit v1.2.3