diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-04-12 14:04:42 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2018-04-12 14:04:42 +0000 |
| commit | ec96244695c80f6282c378a7d3d920677da4658d (patch) | |
| tree | f58e98753682d3f4b4396cdacf90a8df8687f65b /src/cmake/modules | |
| parent | 6b4a552b2bf401e181e7c9af971413505744ffe1 (diff) | |
| parent | d31394cce902b65fcafed8985fe45cfa199b0779 (diff) | |
Merge last trunk modifications
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/python_2.1.0_fix_vincent@3376 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 6d1270a8145be1f57d0a597426b550dd9770249f
Diffstat (limited to 'src/cmake/modules')
| -rw-r--r-- | src/cmake/modules/GUDHI_third_party_libraries.cmake | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/cmake/modules/GUDHI_third_party_libraries.cmake b/src/cmake/modules/GUDHI_third_party_libraries.cmake index 419c2581..a008dd0a 100644 --- a/src/cmake/modules/GUDHI_third_party_libraries.cmake +++ b/src/cmake/modules/GUDHI_third_party_libraries.cmake @@ -63,14 +63,18 @@ if(CGAL_FOUND) endif() endif() +option(WITH_GUDHI_USE_TBB "Build with Intel TBB parallelization" ON) + # Find TBB package for parallel sort - not mandatory, just optional. -set(TBB_FIND_QUIETLY ON) -find_package(TBB) -if (TBB_FOUND) - include(${TBB_USE_FILE}) - message("TBB found in ${TBB_LIBRARY_DIRS}") - add_definitions(-DGUDHI_USE_TBB) -endif() +if(WITH_GUDHI_USE_TBB) + set(TBB_FIND_QUIETLY ON) + find_package(TBB) + if (TBB_FOUND) + include(${TBB_USE_FILE}) + message("TBB found in ${TBB_LIBRARY_DIRS}") + add_definitions(-DGUDHI_USE_TBB) + endif() +endif(WITH_GUDHI_USE_TBB) set(CGAL_WITH_EIGEN3_VERSION 0.0.0) find_package(Eigen3 3.1.0) |