From 8d4f14735bd3ba3329fae1d633d6e5fc69f080f2 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Thu, 27 May 2021 16:03:37 +0200 Subject: [PATCH 1/3] workaround a bug of earlier versions of TBB Laurent said : "That is a bug in earlier versions of TBB. It was fixed in TBB 2019 update 5. That is a bad interaction with #5687, that made the module FindTBB.cmake from CGAL search for TBB in Config mode, first." --- Installation/cmake/modules/FindTBB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/cmake/modules/FindTBB.cmake b/Installation/cmake/modules/FindTBB.cmake index 2a0af128346..e56d524fae2 100644 --- a/Installation/cmake/modules/FindTBB.cmake +++ b/Installation/cmake/modules/FindTBB.cmake @@ -190,7 +190,7 @@ endmacro() # #start with CONFIG Mode -find_package(TBB QUIET NO_MODULE) +find_package(TBB 2019.5 QUIET NO_MODULE) if(TBB_FOUND) return() endif()#TBB_FOUND From 525271c25e166ce16b80b275b22fb6cdbcaead74 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Fri, 28 May 2021 12:20:37 +0200 Subject: [PATCH 2/3] start by looking for TBB_ROOT (env or cmake variable) and TBB_DIR (cmake variable) and fix 2019 Update 5 version number --- Installation/cmake/modules/FindTBB.cmake | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Installation/cmake/modules/FindTBB.cmake b/Installation/cmake/modules/FindTBB.cmake index e56d524fae2..38b4ed82e63 100644 --- a/Installation/cmake/modules/FindTBB.cmake +++ b/Installation/cmake/modules/FindTBB.cmake @@ -188,12 +188,20 @@ endmacro() #============================================================================= # Now to actually find TBB # - -#start with CONFIG Mode -find_package(TBB 2019.5 QUIET NO_MODULE) +#start with looking for TBB_DIR and TBB_ROOT +if((TBB_ROOT OR ENV_TBB_ROOT OR ENV{TBB_DIR} ) AND NOT TBB_FOUND) + find_package(TBB QUIET NO_MODULE NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) +endif() if(TBB_FOUND) return() endif()#TBB_FOUND + +#try CONFIG Mode +find_package(TBB 2019.0.11005 QUIET NO_MODULE) +if(TBB_FOUND) + return() +endif()#TBB_FOUND + # Get path, convert backslashes as ${ENV_${var}} getenv_path(TBB_ROOT) From 321e8293af4da150c5c1d0ed5c9b9cf645436d78 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Fri, 28 May 2021 14:55:14 +0200 Subject: [PATCH 3/3] fix outdated code Co-authored-by: Laurent Rineau --- Installation/cmake/modules/FindTBB.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Installation/cmake/modules/FindTBB.cmake b/Installation/cmake/modules/FindTBB.cmake index 38b4ed82e63..8475edd450d 100644 --- a/Installation/cmake/modules/FindTBB.cmake +++ b/Installation/cmake/modules/FindTBB.cmake @@ -189,7 +189,7 @@ endmacro() # Now to actually find TBB # #start with looking for TBB_DIR and TBB_ROOT -if((TBB_ROOT OR ENV_TBB_ROOT OR ENV{TBB_DIR} ) AND NOT TBB_FOUND) +if((TBB_ROOT OR ENV{TBB_ROOT} OR ENV{TBB_DIR} ) AND NOT TBB_FOUND) find_package(TBB QUIET NO_MODULE NO_CMAKE_SYSTEM_PATH NO_SYSTEM_ENVIRONMENT_PATH) endif() if(TBB_FOUND)