diff options
Diffstat (limited to 'build_files/cmake/macros.cmake')
| -rw-r--r-- | build_files/cmake/macros.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index e159dd9e5ee..c3025be34ba 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -460,13 +460,16 @@ function(setup_liblinks target_link_libraries(${target} ${OSL_LIBRARIES}) endif() if(WITH_OPENVDB) - target_link_libraries(${target} ${OPENVDB_LIBRARIES} ${TBB_LIBRARIES} ${BLOSC_LIBRARIES}) + target_link_libraries(${target} ${OPENVDB_LIBRARIES} ${BLOSC_LIBRARIES}) endif() if(WITH_OPENIMAGEIO) target_link_libraries(${target} ${OPENIMAGEIO_LIBRARIES}) endif() if(WITH_OPENIMAGEDENOISE) - target_link_libraries(${target} ${OPENIMAGEDENOISE_LIBRARIES} ${TBB_LIBRARIES}) + target_link_libraries(${target} ${OPENIMAGEDENOISE_LIBRARIES}) + endif() + if(WITH_TBB) + target_link_libraries(${target} ${TBB_LIBRARIES}) endif() if(WITH_OPENCOLORIO) target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES}) @@ -1209,7 +1212,9 @@ macro(openmp_delayload ) if(MSVC) if(WITH_OPENMP) - if(MSVC_VERSION EQUAL 1800) + if(MSVC_CLANG) + set(OPENMP_DLL_NAME "libomp") + elseif(MSVC_VERSION EQUAL 1800) set(OPENMP_DLL_NAME "vcomp120") else() set(OPENMP_DLL_NAME "vcomp140") |