saberbud/ceres-solver
1
0
Fork 0
mirror of https://github.com/ceres-solver/ceres-solver.git synced 2026-08-29 16:40:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix FindTBB version detection with TBB >= 2021.1.1

Browse Source 
- Raised as issue #669

Change-Id: Ic2fcaf31aef5e303d19a9caef7d6c679325f554a
This commit is contained in:
Alex Stewart
2021-03-15 14:17:59 +00:00
parent 323c350a66
commit 941ea13475
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/FindTBB.cmake
+14 -1
View File
@@ -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")