diff options
Diffstat (limited to 'swap_tbb.patch')
| -rw-r--r-- | swap_tbb.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/swap_tbb.patch b/swap_tbb.patch new file mode 100644 index 000000000000..7241236215fb --- /dev/null +++ b/swap_tbb.patch @@ -0,0 +1,75 @@ +diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt +index 68bdee95..f97146d4 100644 +--- a/ext/CMakeLists.txt ++++ b/ext/CMakeLists.txt +@@ -175,15 +175,7 @@ set(OPENEXR_INCLUDE_DIRS + set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + + # Build Thread Building Blocks (main shared libraries only) +-set(TBB_BUILD_SHARED ON CACHE BOOL " " FORCE) +-set(TBB_BUILD_STATIC OFF CACHE BOOL " " FORCE) +-set(TBB_BUILD_TESTS OFF CACHE BOOL " " FORCE) +-set(TBB_BUILD_TBBMALLOC OFF CACHE BOOL " " FORCE) +-set(TBB_BUILD_TBBMALLOC_PROXY OFF CACHE BOOL " " FORCE) +-add_subdirectory(tbb) +-set_property(TARGET tbb tbb_def_files PROPERTY FOLDER "dependencies") +-set(TBB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/tbb/include) +-set(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIRS} PARENT_SCOPE) ++find_package(TBB CONFIG) + + if (MTS_ENABLE_GUI) + set_property(TARGET glfw glfw_objects nanogui nanogui-obj PROPERTY FOLDER "dependencies") +diff --git a/src/libcore/CMakeLists.txt b/src/libcore/CMakeLists.txt +index 40e461f5..b3fd8383 100644 +--- a/src/libcore/CMakeLists.txt ++++ b/src/libcore/CMakeLists.txt +@@ -86,11 +86,6 @@ target_link_libraries(mitsuba-core PRIVATE + # Image libraries: link to libjpeg, libpng, OpenEXR + ${PNG_LIBRARIES} ${JPEG_LIBRARIES} IlmImf + ) +-# +-if (UNIX AND NOT APPLE) +- target_link_libraries(mitsuba-core PUBLIC +- -Wl,-rpath-link=$<TARGET_FILE_DIR:tbb>) +-endif() + + if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|AMD64") + target_link_libraries(mitsuba-core PRIVATE asmjit) +@@ -102,7 +97,7 @@ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|AMD64") + endif() + + # Copy to 'dist' directory +-add_dist(mitsuba-core IlmThread Half Half Imath IlmImf Iex tbb) ++add_dist(mitsuba-core IlmThread Half Half Imath IlmImf Iex) + + if (CMAKE_CXX_COMPILER_ID MATCHES "^(GNU)$") + target_link_libraries(mitsuba-core PRIVATE -Wl,--no-undefined) +diff --git a/ext/rgb2spec/CMakeLists.txt b/ext/rgb2spec/CMakeLists.txt +index 601af55f..e9fe41b7 100644 +--- a/ext/rgb2spec/CMakeLists.txt ++++ b/ext/rgb2spec/CMakeLists.txt +@@ -18,7 +18,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|Intel") + endif() + + +-if (TARGET tbb) ++if (TBB_FOUND) + add_definitions(-DRGB2SPEC_USE_TBB=1) + include_directories(${TBB_INCLUDE_DIRS}) + else () +@@ -34,14 +34,8 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) + add_executable(rgb2spec_opt rgb2spec_opt.cpp) + add_library(rgb2spec STATIC rgb2spec.c) + +-if (TARGET tbb) ++if (TBB_FOUND) + target_link_libraries(rgb2spec_opt PRIVATE tbb) +- +- add_custom_command(TARGET rgb2spec_opt POST_BUILD +- COMMAND ${CMAKE_COMMAND} -E copy_if_different +- $<TARGET_FILE:tbb> +- $<TARGET_FILE_DIR:rgb2spec_opt> +- ) + endif() + + add_custom_command( |