blob: e05d089e1615eef338ef8062f7a25b13cbb6fd30 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
From 941ea13475913ef8322584f7401633de9967ccc8 Mon Sep 17 00:00:00 2001
From: Alex Stewart <alexs.mac@gmail.com>
Date: Mon, 15 Mar 2021 14:17:59 +0000
Subject: [PATCH] Fix FindTBB version detection with TBB >= 2021.1.1
- Raised as issue #669
Change-Id: Ic2fcaf31aef5e303d19a9caef7d6c679325f554a
---
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.34.1
|