diff --git a/CMakeLists.txt b/CMakeLists.txt index af55c0b..913ca36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ endif() find_package(Embree REQUIRED) include_directories(${EMBREE_INCLUDE_PATH}) -link_libraries(${EMBREE_LIBRARY} ${TBB_LIBRARY}) +link_libraries(${EMBREE_LIBRARY}) include_directories(${CMAKE_SOURCE_DIR}/src) diff --git a/cmake/FindEmbree.cmake b/cmake/FindEmbree.cmake index 6ff52d0..f9c9f7a 100644 --- a/cmake/FindEmbree.cmake +++ b/cmake/FindEmbree.cmake @@ -10,29 +10,17 @@ find_library(EMBREE_LIBRARY NAMES embree4 PATHS /usr/lib /usr/local/lib /opt/local/lib) -find_library(TBB_LIBRARY NAMES tbb PATHS - ${CMAKE_SOURCE_DIR}/embree/lib-macos - /usr/lib - /usr/local/lib - /opt/local/lib) elseif (WIN32) find_library(EMBREE_LIBRARY NAMES embree4 PATHS ${CMAKE_SOURCE_DIR}/embree/lib-win32) -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 /usr/local/lib /opt/local/lib) -find_library(TBB_LIBRARY NAMES tbb PATHS - ${CMAKE_SOURCE_DIR}/embree/lib-linux - /usr/lib - /usr/local/lib - /opt/local/lib) endif () -if (EMBREE_INCLUDE_PATH AND EMBREE_LIBRARY AND TBB_LIBRARY) +if (EMBREE_INCLUDE_PATH AND EMBREE_LIBRARY) set(EMBREE_FOUND TRUE) endif () \ No newline at end of file diff --git a/embree/lib-macos/libembree4.4.dylib b/embree/lib-macos/libembree4.4.dylib index fed7b61..4b93bf5 100755 Binary files a/embree/lib-macos/libembree4.4.dylib and b/embree/lib-macos/libembree4.4.dylib differ diff --git a/embree/lib-macos/libtbb.12.7.dylib b/embree/lib-macos/libtbb.12.7.dylib deleted file mode 100644 index 455ec39..0000000 Binary files a/embree/lib-macos/libtbb.12.7.dylib and /dev/null differ diff --git a/embree/lib-macos/libtbb.12.9.dylib b/embree/lib-macos/libtbb.12.9.dylib new file mode 100644 index 0000000..3df8d35 Binary files /dev/null and b/embree/lib-macos/libtbb.12.9.dylib differ diff --git a/embree/lib-macos/libtbb.12.dylib b/embree/lib-macos/libtbb.12.dylib index 826450a..2f376fb 120000 --- a/embree/lib-macos/libtbb.12.dylib +++ b/embree/lib-macos/libtbb.12.dylib @@ -1 +1 @@ -libtbb.12.7.dylib \ No newline at end of file +libtbb.12.9.dylib \ No newline at end of file diff --git a/embree/lib-macos/libtbb.a b/embree/lib-macos/libtbb.a deleted file mode 100644 index 09ad0b0..0000000 Binary files a/embree/lib-macos/libtbb.a and /dev/null differ