From a8825db59a7235c9d267ac4f909bd2eebb25cb40 Mon Sep 17 00:00:00 2001 From: Kenneth Moreland Date: Wed, 9 Jun 2021 07:08:53 -0600 Subject: [PATCH] Disable loading the TBBConfig.cmake file Sourcing the file installed on dragnipur is causing a CMake error. I don't know if it is an install error or a problem with FindTBB.cmake, but this should get around the problem by just using the "old" method for finding TBB. --- CMake/FindTBB.cmake | 49 ++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/CMake/FindTBB.cmake b/CMake/FindTBB.cmake index bd7563131..95cc79586 100644 --- a/CMake/FindTBB.cmake +++ b/CMake/FindTBB.cmake @@ -70,29 +70,32 @@ # Use TBBConfig.cmake if possible. -set(_tbb_find_quiet) -if (TBB_FIND_QUIETLY) - set(_tbb_find_quiet QUIET) -endif () -set(_tbb_find_components) -set(_tbb_find_optional_components) -foreach (_tbb_find_component IN LISTS TBB_FIND_COMPONENTS) - if (TBB_FIND_REQUIRED_${_tbb_find_component}) - list(APPEND _tbb_find_components "${_tbb_find_component}") - else () - list(APPEND _tbb_find_optional_components "${_tbb_find_component}") - endif () -endforeach () -unset(_tbb_find_component) -find_package(TBB CONFIG ${_tbb_find_quiet} - COMPONENTS ${_tbb_find_components} - OPTIONAL_COMPONENTS ${_tbb_find_optional_components}) -unset(_tbb_find_quiet) -unset(_tbb_find_components) -unset(_tbb_find_optional_components) -if (TBB_FOUND) - return () -endif () +# Disabling this as it running the TBBConfig.cmake on dragnipur is +# causing a CMake error. I don't know if this is an install problem +# or an issue with version 2018.0. +# set(_tbb_find_quiet) +# if (TBB_FIND_QUIETLY) +# set(_tbb_find_quiet QUIET) +# endif () +# set(_tbb_find_components) +# set(_tbb_find_optional_components) +# foreach (_tbb_find_component IN LISTS TBB_FIND_COMPONENTS) +# if (TBB_FIND_REQUIRED_${_tbb_find_component}) +# list(APPEND _tbb_find_components "${_tbb_find_component}") +# else () +# list(APPEND _tbb_find_optional_components "${_tbb_find_component}") +# endif () +# endforeach () +# unset(_tbb_find_component) +# find_package(TBB CONFIG ${_tbb_find_quiet} +# COMPONENTS ${_tbb_find_components} +# OPTIONAL_COMPONENTS ${_tbb_find_optional_components}) +# unset(_tbb_find_quiet) +# unset(_tbb_find_components) +# unset(_tbb_find_optional_components) +# if (TBB_FOUND) +# return () +# endif () #==================================================== # Fix the library path in case it is a linker script