diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-01-07 15:11:09 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-01-07 15:11:09 +0000 |
| commit | 0a5b697f959d673fd51d70058fd3fe90f7c15125 (patch) | |
| tree | 6382a7c916a5a01ba9b555c7482158e7bca09896 /src | |
| parent | 9aa0cbbea297ea5996eb0d7fa2fcec3f3b773c98 (diff) | |
TBB find package mechanism with definition for code purpose.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/tbb@952 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 9b4dcb962d1af208feccf831171029479d37831e
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/cmake/modules/UseTBB.cmake | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a84090e9..0e8de7cc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,6 +29,10 @@ endif() find_package(CGAL) +# Find TBB package for parallel sort - not mandatory, just optional. +set(TBB_FIND_QUIETLY ON) +find_package(TBB) + if(NOT Boost_FOUND) message(FATAL_ERROR "NOTICE: This demo requires Boost and will not be compiled.") else() diff --git a/src/cmake/modules/UseTBB.cmake b/src/cmake/modules/UseTBB.cmake index 9d09bf3e..e1ef5dfe 100644 --- a/src/cmake/modules/UseTBB.cmake +++ b/src/cmake/modules/UseTBB.cmake @@ -3,4 +3,4 @@ include_directories ( ${TBB_INCLUDE_DIRS} ) link_directories( ${TBB_LIBRARY_DIRS} ) -add_definitions( -DNOMINMAX -DGUDHI_LINKED_WITH_TBB ) +add_definitions( -DNOMINMAX -DGUDHI_USE_TBB ) |