From 9aa0cbbea297ea5996eb0d7fa2fcec3f3b773c98 Mon Sep 17 00:00:00 2001 From: cjamin Date: Thu, 10 Dec 2015 16:03:15 +0000 Subject: Forgot UseTBB.cmake git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/tbb@940 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: bf6c4d9a54798895a34b89d655f7817534feb8b5 --- src/cmake/modules/UseTBB.cmake | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/cmake/modules/UseTBB.cmake (limited to 'src/cmake/modules/UseTBB.cmake') diff --git a/src/cmake/modules/UseTBB.cmake b/src/cmake/modules/UseTBB.cmake new file mode 100644 index 00000000..9d09bf3e --- /dev/null +++ b/src/cmake/modules/UseTBB.cmake @@ -0,0 +1,6 @@ +# This module setups the compiler for using TBB library. +# It assumes that find_package(TBB) was already called. + +include_directories ( ${TBB_INCLUDE_DIRS} ) +link_directories( ${TBB_LIBRARY_DIRS} ) +add_definitions( -DNOMINMAX -DGUDHI_LINKED_WITH_TBB ) -- cgit v1.2.3 From 0a5b697f959d673fd51d70058fd3fe90f7c15125 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 7 Jan 2016 15:11:09 +0000 Subject: 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 --- CMakeLists.txt | 4 ++++ src/CMakeLists.txt | 4 ++++ src/cmake/modules/UseTBB.cmake | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/cmake/modules/UseTBB.cmake') diff --git a/CMakeLists.txt b/CMakeLists.txt index ae089562..edf7e63f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,6 +34,10 @@ endif() find_package(CGAL) +# Find TBB package for parallel sort - not mandatory, just optional. +set(TBB_FIND_QUIETLY ON) +find_package(TBB) + # Required programs for unitary tests purpose FIND_PROGRAM( GCOVR_PATH gcovr ) if (GCOVR_PATH) 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 ) -- cgit v1.2.3