Skip to content

Commit

Permalink
Per pca006132, remove unnecessary find_package call for oneDPL.
Browse files Browse the repository at this point in the history
  • Loading branch information
starseeker committed Sep 28, 2024
1 parent d62c6c6 commit 053aff6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,6 @@ endif()
if(MANIFOLD_PAR STREQUAL "TBB")
find_package(Threads REQUIRED)
find_package(TBB QUIET)
if(APPLE)
find_package(oneDPL QUIET)
endif()
find_package(PkgConfig QUIET)
if(NOT TBB_FOUND AND PKG_CONFIG_FOUND)
pkg_check_modules(TBB tbb)
Expand Down
14 changes: 3 additions & 11 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,10 @@ if(MANIFOLD_CROSS_SECTION)
endif()
endif()
if(MANIFOLD_PAR STREQUAL "TBB")
if (NOT APPLE)
if(TARGET TBB::tbb)
list(APPEND MANIFOLD_LIBS TBB::tbb)
else()
list(APPEND MANIFOLD_LIBS ${TBB_LINK_LIBRARIES})
endif()
if(TARGET TBB::tbb)
list(APPEND MANIFOLD_LIBS TBB::tbb)
else()
if(oneDPL_FOUND)
list(APPEND MANIFOLD_LIBS oneDPL)
else()
message(WARNING "oneDPL not found, sequential implementation is used instead")
endif()
list(APPEND MANIFOLD_LIBS ${TBB_LINK_LIBRARIES})
endif()
endif()

Expand Down

0 comments on commit 053aff6

Please sign in to comment.