From: Matthias Maier Date: Wed, 12 Jan 2022 14:55:26 +0000 (-0600) Subject: CMake: adjust tbb path glob to "lib/intel64/gcc*" layout X-Git-Tag: v9.3.3~4^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1061d533ff79eb11133aeee183c31f2e0286b6d;p=dealii.git CMake: adjust tbb path glob to "lib/intel64/gcc*" layout PR: #13227 --- diff --git a/cmake/modules/FindTBB.cmake b/cmake/modules/FindTBB.cmake index a92ade7f86..43225a4ad7 100644 --- a/cmake/modules/FindTBB.cmake +++ b/cmake/modules/FindTBB.cmake @@ -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