diff options
Diffstat (limited to 'build_files/cmake/platform/platform_unix.cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 9 |
1 files changed, 3 insertions, 6 deletions
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() |