From 1a7bb62c0d0865ea8c04007a2bf1fda06e0ca1d0 Mon Sep 17 00:00:00 2001 From: sdcm Date: Wed, 20 Nov 2024 16:44:15 +0100 Subject: [PATCH] [arccon,modules] Add ARCCON_NO_TBB_CONFIG CMake variable to bypass call to find_package for TBB. --- arccon/build-system/Modules/FindTBB.cmake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arccon/build-system/Modules/FindTBB.cmake b/arccon/build-system/Modules/FindTBB.cmake index 7823068af5..1d9806671b 100644 --- a/arccon/build-system/Modules/FindTBB.cmake +++ b/arccon/build-system/Modules/FindTBB.cmake @@ -12,11 +12,13 @@ arccon_return_if_package_found(TBB) # A partir des versions OneTBB (2020+), il existe un fichier de configuration # CMake pour TBB. On tente de l'utiliser si possible -# Tente d'utiliser le module correspondant de CMake -set(_SAVED_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) -unset(CMAKE_MODULE_PATH) -find_package(TBB CONFIG QUIET COMPONENTS tbb) -set(CMAKE_MODULE_PATH ${_SAVED_CMAKE_MODULE_PATH}) +# Tente d'utiliser le module correspondant de CMake, sauf si la variable ARCCON_NO_TBB_CONFIG est activée +if (NOT ARCCON_NO_TBB_CONFIG) + set(_SAVED_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) + unset(CMAKE_MODULE_PATH) + find_package(TBB CONFIG QUIET COMPONENTS tbb) + set(CMAKE_MODULE_PATH ${_SAVED_CMAKE_MODULE_PATH}) +endif () # vcpkg ne positionne ni TBB_tbb_found ni TBB_IMPORTED_TARGETS # On utilise donc direction 'TBB::tbb'