]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: adjust tbb path glob to "lib/intel64/gcc*" layout 13233/head
authorMatthias Maier <tamiko@43-1.org>
Wed, 12 Jan 2022 14:55:26 +0000 (08:55 -0600)
committerMarc Fehling <mafehling.git@gmail.com>
Thu, 13 Jan 2022 11:58:31 +0000 (12:58 +0100)
PR: #13227

cmake/modules/FindTBB.cmake

index a92ade7f867bedea4fab8f7f8fea12296dafcd12..43225a4ad77ce91c380507966abd176c2ba95a80 100644 (file)
@@ -30,7 +30,7 @@
 SET(TBB_DIR "" CACHE PATH "An optional hint to a TBB installation")
 SET_IF_EMPTY(TBB_DIR "$ENV{TBB_DIR}")
 
-FILE(GLOB _path ${TBB_DIR}/build/*_release)
+FILE(GLOB _path ${TBB_DIR}/build/*_release ${TBB_DIR}/lib/intel64/gcc*)
 DEAL_II_FIND_LIBRARY(TBB_LIBRARY
   NAMES tbb
   HINTS
@@ -42,7 +42,7 @@ DEAL_II_FIND_LIBRARY(TBB_LIBRARY
 #
 # Also search for the debug library:
 #
-FILE(GLOB _path ${TBB_DIR}/build/*_debug)
+FILE(GLOB _path ${TBB_DIR}/build/*_debug ${TBB_DIR}/lib/intel64/gcc*)
 DEAL_II_FIND_LIBRARY(TBB_DEBUG_LIBRARY
   NAMES tbb_debug
   HINTS

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.