update FindTBB.cmake

COMBINE-lab · Jan 23, 2017 · d2568b9 · d2568b9
1 parent 758c3b0
commit d2568b9
Show file tree

Hide file tree

Showing 2 changed files with 306 additions and 285 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -436,15 +436,15 @@ ExternalProject_Add(libjellyfish
 set (FETCHED_JELLYFISH TRUE)
 endif()
 
-## TODO
-# find_package(TBB)
+## Try and find TBB first
+find_package(TBB 4.4 COMPONENTS tbb tbbmalloc tbbmalloc_proxy )
 
 ##
 #
 # Fetch and build Intel's Threading Building Blocks library.
 #
 ##
-if(NOT TBB_FOUND)
+if((NOT TBB_FOUND) OR (TBB_FOUND AND (TBB_VERSION VERSION_LESS 4.4)))
 
 set(TBB_WILL_RECONFIGURE TRUE)
 # Set the appropriate compiler