diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-04-05 19:47:10 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-04-05 19:47:10 +0300 |
| commit | 7748dd4ec735535f53f61d6aa4a2f6b9db9abdc1 (patch) | |
| tree | 65f854f448a2503bef50781212355b74fa616839 /intern/cycles/cmake/macros.cmake | |
| parent | 9e12a731db6f6647d5e6dfdaa32fc4d8117a523d (diff) | |
| parent | b84255f590c07b129f726eadbfec72c73bfc2ee1 (diff) | |
Merge remote-tracking branch 'origin/master' into temp-sculpt-colorstemp-sculpt-colors
Diffstat (limited to 'intern/cycles/cmake/macros.cmake')
| -rw-r--r-- | intern/cycles/cmake/macros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/cmake/macros.cmake b/intern/cycles/cmake/macros.cmake index e69e31f8e52..7c14fd87518 100644 --- a/intern/cycles/cmake/macros.cmake +++ b/intern/cycles/cmake/macros.cmake @@ -144,13 +144,13 @@ macro(cycles_install_libraries target) if(CMAKE_BUILD_TYPE STREQUAL "Debug") install( FILES - ${TBB_ROOT_DIR}/lib/debug/tbb_debug${CMAKE_SHARED_LIBRARY_SUFFIX} + ${TBB_ROOT_DIR}/bin/tbb_debug${CMAKE_SHARED_LIBRARY_SUFFIX} ${OPENVDB_ROOT_DIR}/bin/openvdb_d${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION $<TARGET_FILE_DIR:${target}>) else() install( FILES - ${TBB_ROOT_DIR}/lib/tbb${CMAKE_SHARED_LIBRARY_SUFFIX} + ${TBB_ROOT_DIR}/bin/tbb${CMAKE_SHARED_LIBRARY_SUFFIX} ${OPENVDB_ROOT_DIR}/bin/openvdb${CMAKE_SHARED_LIBRARY_SUFFIX} DESTINATION $<TARGET_FILE_DIR:${target}>) endif() |