Skip to content

Commit

Permalink
Downgrade MacOS embree binary
Browse files Browse the repository at this point in the history
  • Loading branch information
BachiLi committed Jan 8, 2024
1 parent 72c748e commit d1b4ad2
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
14 changes: 1 addition & 13 deletions cmake/FindEmbree.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Binary file modified embree/lib-macos/libembree4.4.dylib
Binary file not shown.
Binary file removed embree/lib-macos/libtbb.12.7.dylib
Binary file not shown.
Binary file added embree/lib-macos/libtbb.12.9.dylib
Binary file not shown.
2 changes: 1 addition & 1 deletion embree/lib-macos/libtbb.12.dylib
Binary file removed embree/lib-macos/libtbb.a
Binary file not shown.

0 comments on commit d1b4ad2

Please sign in to comment.