Fix FindEmbree typo and update MacOS tbb library

BachiLi · Jan 8, 2024 · 336a255 · 336a255
1 parent 3d49560
commit 336a255
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 4 deletions.
diff --git a/cmake/FindEmbree.cmake b/cmake/FindEmbree.cmake
@@ -18,9 +18,9 @@ find_library(TBB_LIBRARY NAMES tbb PATHS
 elseif (WIN32)
 find_library(EMBREE_LIBRARY NAMES embree4 PATHS
   ${CMAKE_SOURCE_DIR}/embree/lib-win32)
-else ()
 find_library(TBB_LIBRARY NAMES tbb PATHS
   ${CMAKE_SOURCE_DIR}/embree/lib-win32)
+else ()
 find_library(EMBREE_LIBRARY NAMES embree4 PATHS
   ${CMAKE_SOURCE_DIR}/embree/lib-linux
   /usr/lib

diff --git a/embree/lib-macos/libtbb.12.5.dylib b/embree/lib-macos/libtbb.12.5.dylib
diff --git a/embree/lib-macos/libtbb.12.7.dylib b/embree/lib-macos/libtbb.12.7.dylib
diff --git a/embree/lib-macos/libtbb.12.dylib b/embree/lib-macos/libtbb.12.dylib
@@ -1 +1 @@
-../Cellar/tbb/2021.5.0_2/lib/libtbb.12.dylib
+libtbb.12.7.dylib
diff --git a/embree/lib-macos/libtbb.a b/embree/lib-macos/libtbb.a
diff --git a/embree/lib-macos/libtbb.a b/embree/lib-macos/libtbb.a
diff --git a/embree/lib-macos/libtbb.dylib b/embree/lib-macos/libtbb.dylib
@@ -1 +1 @@
-../Cellar/tbb/2021.5.0_2/lib/libtbb.dylib
+libtbb.12.dylib
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../Cellar/tbb/2021.5.0_2/lib/libtbb.12.dylib
		libtbb.12.7.dylib
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../Cellar/tbb/2021.5.0_2/lib/libtbb.dylib
		libtbb.12.dylib