41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 9aa52c6ff74358d1b91542221e0545bb61bdedcc Sun May 15 00:00:00 2001
|
|
From: Alexs Mayorga <amayorga@cproperties.com>
|
|
Date: Sun, 15 May 2021 10:47:19 +0800
|
|
Subject: [PATCH] Fix FindTBB version detection with TBB >= 2021.1.1
|
|
|
|
---
|
|
cmake/FindTBB.cmake | 15 ++++++++++++++-
|
|
1 file changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
|
|
index 5ae7b61..10e540d 100644
|
|
--- a/cmake/FindTBB.cmake
|
|
+++ b/cmake/FindTBB.cmake
|
|
@@ -429,10 +429,23 @@ findpkg_finish(TBB_MALLOC_PROXY tbbmalloc_proxy)
|
|
#=============================================================================
|
|
#parse all the version numbers from tbb
|
|
if(NOT TBB_VERSION)
|
|
+ set(TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1
|
|
+ "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h")
|
|
+ set(TBB_VERSION_FILE_AFTER_TBB_2021_1
|
|
+ "${TBB_INCLUDE_DIR}/oneapi/tbb/version.h")
|
|
+
|
|
+ if (EXISTS "${TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1}")
|
|
+ set(TBB_VERSION_FILE "${TBB_VERSION_FILE_PRIOR_TO_TBB_2021_1}")
|
|
+ elseif (EXISTS "${TBB_VERSION_FILE_AFTER_TBB_2021_1}")
|
|
+ set(TBB_VERSION_FILE "${TBB_VERSION_FILE_AFTER_TBB_2021_1}")
|
|
+ else()
|
|
+ message(FATAL_ERROR "Found TBB installation: ${TBB_INCLUDE_DIR} "
|
|
+ "missing version header.")
|
|
+ endif()
|
|
|
|
#only read the start of the file
|
|
file(STRINGS
|
|
- "${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h"
|
|
+ "${TBB_VERSION_FILE}"
|
|
TBB_VERSION_CONTENTS
|
|
REGEX "VERSION")
|
|
|
|
--
|
|
2.43.0
|