diff options
Diffstat (limited to 'intern/cycles/cmake/external_libs.cmake')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index aaeb85f700d..5854c80fb9f 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -69,6 +69,7 @@ if(CYCLES_STANDALONE_REPOSITORY) _set_default(BOOST_ROOT "${_cycles_lib_dir}/boost") _set_default(BLOSC_ROOT_DIR "${_cycles_lib_dir}/blosc") _set_default(EMBREE_ROOT_DIR "${_cycles_lib_dir}/embree") + _set_default(EPOXY_ROOT_DIR "${_cycles_lib_dir}/epoxy") _set_default(IMATH_ROOT_DIR "${_cycles_lib_dir}/imath") _set_default(GLEW_ROOT_DIR "${_cycles_lib_dir}/glew") _set_default(JPEG_ROOT "${_cycles_lib_dir}/jpeg") @@ -91,7 +92,11 @@ if(CYCLES_STANDALONE_REPOSITORY) _set_default(USD_ROOT_DIR "${_cycles_lib_dir}/usd") _set_default(WEBP_ROOT_DIR "${_cycles_lib_dir}/webp") _set_default(ZLIB_ROOT "${_cycles_lib_dir}/zlib") - _set_default(LEVEL_ZERO_ROOT_DIR "${_cycles_lib_dir}/level-zero") + if(WIN32) + set(LEVEL_ZERO_ROOT_DIR ${_cycles_lib_dir}/level_zero) + else() + set(LEVEL_ZERO_ROOT_DIR ${_cycles_lib_dir}/level-zero) + endif() _set_default(SYCL_ROOT_DIR "${_cycles_lib_dir}/dpcpp") # Ignore system libraries @@ -197,17 +202,17 @@ endif() if(CYCLES_STANDALONE_REPOSITORY) if(MSVC AND EXISTS ${_cycles_lib_dir}) set(OPENEXR_INCLUDE_DIR ${OPENEXR_ROOT_DIR}/include) - set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_ROOT_DIR}/include/OpenEXR) + set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_ROOT_DIR}/include/OpenEXR ${IMATH_ROOT_DIR}/include ${IMATH_ROOT_DIR}/include/Imath) set(OPENEXR_LIBRARIES + optimized ${OPENEXR_ROOT_DIR}/lib/OpenEXR_s.lib + optimized ${OPENEXR_ROOT_DIR}/lib/OpenEXRCore_s.lib optimized ${OPENEXR_ROOT_DIR}/lib/Iex_s.lib - optimized ${OPENEXR_ROOT_DIR}/lib/Half_s.lib - optimized ${OPENEXR_ROOT_DIR}/lib/IlmImf_s.lib - optimized ${OPENEXR_ROOT_DIR}/lib/Imath_s.lib + optimized ${IMATH_ROOT_DIR}/lib/Imath_s.lib optimized ${OPENEXR_ROOT_DIR}/lib/IlmThread_s.lib + debug ${OPENEXR_ROOT_DIR}/lib/OpenEXR_s_d.lib + debug ${OPENEXR_ROOT_DIR}/lib/OpenEXRCore_s_d.lib debug ${OPENEXR_ROOT_DIR}/lib/Iex_s_d.lib - debug ${OPENEXR_ROOT_DIR}/lib/Half_s_d.lib - debug ${OPENEXR_ROOT_DIR}/lib/IlmImf_s_d.lib - debug ${OPENEXR_ROOT_DIR}/lib/Imath_s_d.lib + debug ${IMATH_ROOT_DIR}/lib/Imath_s_d.lib debug ${OPENEXR_ROOT_DIR}/lib/IlmThread_s_d.lib ) else() @@ -319,8 +324,8 @@ if(CYCLES_STANDALONE_REPOSITORY) if(NOT BOOST_VERSION) message(FATAL_ERROR "Unable to determine Boost version") endif() - set(BOOST_POSTFIX "vc141-mt-x64-${BOOST_VERSION}.lib") - set(BOOST_DEBUG_POSTFIX "vc141-mt-gd-x64-${BOOST_VERSION}.lib") + set(BOOST_POSTFIX "vc142-mt-x64-${BOOST_VERSION}.lib") + set(BOOST_DEBUG_POSTFIX "vc142-mt-gd-x64-${BOOST_VERSION}.lib") set(BOOST_LIBRARIES optimized ${BOOST_ROOT}/lib/libboost_date_time-${BOOST_POSTFIX} optimized ${BOOST_ROOT}/lib/libboost_iostreams-${BOOST_POSTFIX} @@ -459,6 +464,7 @@ if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_NANOVDB) if(MSVC AND EXISTS ${_cycles_lib_dir}) set(NANOVDB_INCLUDE_DIR ${NANOVDB_ROOT_DIR}/include) + set(NANOVDB_INCLUDE_DIRS ${NANOVDB_INCLUDE_DIR}) else() find_package(NanoVDB REQUIRED) endif() |