CMake: Bugfix in FindTBB.cmake

git-svn-id: https://svn.dealii.org/trunk@29011 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/modules/FindTBB.cmake b/deal.II/cmake/modules/FindTBB.cmake
index f909420e6e5d0a597fdb3bc865aca322d9d84aa8..cb603dadb86f56d4a59528322384f8b510a0e324 100644 (file)
--- a/deal.II/cmake/modules/FindTBB.cmake
+++ b/deal.II/cmake/modules/FindTBB.cmake
@@ -55,9 +55,9 @@ IF(TBB_FOUND)
 
   IF(NOT TBB_DEBUG_LIBRARY MATCHES "-NOTFOUND")
     SET(TBB_WITH_DEBUGLIB TRUE)
-    SET(TBB_LIBRARIES debug ${TBB_LIBARY} optimized ${TBB_LIBRARY})
+    SET(TBB_LIBRARIES debug ${TBB_DEBUG_LIBRARY} optimized ${TBB_LIBRARY})
   ELSE()
-    SET(TBB_LIBRARIES ${TBB_LIBARY})
+    SET(TBB_LIBRARIES ${TBB_LIBRARY})
   ENDIF()
 
   SET(TBB_INCLUDE_DIRS ${TBB_INCLUDE_DIR})

diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake
index 77af8b2058f88600e79de0378fa1144aeda621ee..7068004b079fc0281c6c6b2c820aa01ea898d1bf 100644 (file)
--- a/deal.II/cmake/setup_finalize.cmake
+++ b/deal.II/cmake/setup_finalize.cmake
@@ -138,6 +138,8 @@ FOREACH(_var ${_features})
             _var2 MATCHES "^${_feature}_CXX_(COMPILER|COMPILE_FLAGS|LINK_FLAGS|LIBRARIES|INCLUDE_PATH)$" OR
             # Boost:
             ( _feature MATCHES "BOOST" AND _var2 MATCHES "^Boost(_LIBRARIES|_INCLUDE_DIRS)$" ) OR
+            # TBB:
+            ( _feature MATCHES "THREADS" AND _var2 MATCHES "^TBB(_LIBRARIES|_INCLUDE_DIRS)$" ) OR
             # Generic:
             ( (NOT _var2 MATCHES "^(MPI|Boost)") AND
               _var2 MATCHES "^${_feature}_(INCLUDE_DIRS|LIBRARIES|LINKER_FLAGS)$" )