Skip to content

Commit

Permalink
[cmake] Fix version detection for old TBB
Browse files Browse the repository at this point in the history
Even if not supported anymore, we must be able to determine the old
TBB versions to *not* pick it up. Add back the check for the previous
header that was removed in commit a1d969d.
  • Loading branch information
hahnjo committed Mar 12, 2024
1 parent 8bbf9cc commit 1ff8578
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions cmake/modules/FindTBB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,11 @@ IF (EXISTS ${TBB_INCLUDE_DIR}/oneapi)
SET (_TBB_VERSION_HEADER ${TBB_INCLUDE_DIR}/oneapi/tbb/version.h)
ELSE (EXISTS ${TBB_INCLUDE_DIR}/oneapi)
SET (_TBB_VERSION_HEADER ${TBB_INCLUDE_DIR}/tbb/version.h)
# ROOT requires at least TBB 2020, but we must be able to determine older
# versions in order to properly warn the user.
IF (NOT EXISTS ${_TBB_VERSION_HEADER})
SET (_TBB_VERSION_HEADER ${TBB_INCLUDE_DIR}/tbb/tbb_stddef.h)
ENDIF (NOT EXISTS ${_TBB_VERSION_HEADER})
ENDIF (EXISTS ${TBB_INCLUDE_DIR}/oneapi)

IF (EXISTS ${_TBB_VERSION_HEADER})
Expand Down

0 comments on commit 1ff8578

Please sign in to comment.