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_apple.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_apple.cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 7 |
1 files changed, 2 insertions, 5 deletions
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) |