Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'build_files/build_environment/patches/embree.diff')
-rw-r--r--build_files/build_environment/patches/embree.diff16
1 files changed, 16 insertions, 0 deletions
diff --git a/build_files/build_environment/patches/embree.diff b/build_files/build_environment/patches/embree.diff
index 9b2c66feaf7..e83d754a465 100644
--- a/build_files/build_environment/patches/embree.diff
+++ b/build_files/build_environment/patches/embree.diff
@@ -12,3 +12,19 @@ diff -Naur orig/common/sys/platform.h external_embree/common/sys/platform.h
#else
#define dll_export __attribute__ ((visibility ("default")))
#define dll_import
+diff --git orig/common/tasking/CMakeLists.txt external_embree/common/tasking/CMakeLists.txt
+--- orig/common/tasking/CMakeLists.txt
++++ external_embree/common/tasking/CMakeLists.txt
+@@ -27,7 +27,11 @@
+ else()
+ # If not found try getting older TBB via module (FindTBB.cmake)
+ unset(TBB_DIR CACHE)
+- find_package(TBB 4.1 REQUIRED tbb)
++ if (TBB_STATIC_LIB)
++ find_package(TBB 4.1 REQUIRED tbb_static)
++ else()
++ find_package(TBB 4.1 REQUIRED tbb)
++ endif()
+ if (TBB_FOUND)
+ TARGET_LINK_LIBRARIES(tasking PUBLIC TBB)
+ TARGET_INCLUDE_DIRECTORIES(tasking PUBLIC "${TBB_INCLUDE_DIRS}")