diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-09-05 15:33:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-09-08 11:10:00 +0300 |
| commit | 2cdfa3ea5bbe73cc5595e0434c128819331654b6 (patch) | |
| tree | a8fc6f722ab1a9e41a68cf5239d3469ca6c1b4f4 /intern/cycles/cmake/external_libs.cmake | |
| parent | cb7c61ad54586d83b358af49198cca8cdb00834d (diff) | |
Cycles: Support building with latest upstream OSL
Only affects standalone part.
Diffstat (limited to 'intern/cycles/cmake/external_libs.cmake')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index d7c59f42a5e..10a166b6e44 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -87,6 +87,13 @@ if(CYCLES_STANDALONE_REPOSITORY) find_package(OpenEXR) #### + # OpenShadingLanguage + if(WITH_CYCLES_OSL) + find_package(OpenShadingLanguage REQUIRED) + find_package(LLVM REQUIRED) + endif() + + #### # Boost set(__boost_packages filesystem regex system thread date_time) if(WITH_CYCLES_NETWORK) @@ -97,6 +104,8 @@ if(CYCLES_STANDALONE_REPOSITORY) # libraries works, could be different for someone's else libs.. if(APPLE OR MSVC) list(APPEND __boost_packages wave) + elseif(NOT (${OSL_LIBRARY_VERSION_MAJOR} EQUAL "1" AND ${OSL_LIBRARY_VERSION_MINOR} LESS "6")) + list(APPEND __boost_packages wave) endif() endif() find_package(Boost 1.48 COMPONENTS ${__boost_packages} REQUIRED) @@ -114,13 +123,6 @@ if(CYCLES_STANDALONE_REPOSITORY) set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB") #### - # OpenShadingLanguage - if(WITH_CYCLES_OSL) - find_package(OpenShadingLanguage REQUIRED) - find_package(LLVM REQUIRED) - endif() - - #### # Logging if(WITH_CYCLES_LOGGING) find_package(Glog REQUIRED) |