diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-12-07 20:31:36 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-12-07 21:01:39 +0300 |
| commit | 13af88b23f70a26cad26556ab70a9adb6f6191c0 (patch) | |
| tree | c3be88e32329f216a573a8ac5e5fe5da2469ad1e /build_files/cmake/platform/platform_win32.cmake | |
| parent | e14f8c2dd765a5f20d652899434174daa039804b (diff) | |
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
Diffstat (limited to 'build_files/cmake/platform/platform_win32.cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
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) |