From 8df8f4a735698c6c5bd0e29f29649fabe9b5384f Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Thu, 27 Dec 2018 08:38:57 -0700 Subject: [PATCH] Clear the previously determined TBB version if we need to revert to the bundled one. --- cmake/configure/configure_1_threads.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmake/configure/configure_1_threads.cmake b/cmake/configure/configure_1_threads.cmake index 7cfe00dd43..6130e2e0b2 100644 --- a/cmake/configure/configure_1_threads.cmake +++ b/cmake/configure/configure_1_threads.cmake @@ -146,6 +146,11 @@ MACRO(FEATURE_THREADS_FIND_EXTERNAL var) # versions: # IF(TBB_VERSION VERSION_LESS "4.2") + # Clear the previously determined version numbers to avoid confusion + SET(TBB_VERSION "bundled") + SET(TBB_VERSION_MAJOR "") + SET(TBB_VERSION_MINOR "") + MESSAGE(STATUS "The externally provided TBB library is older than version 4.2.0, which " "cannot be used with deal.II." -- 2.39.5