From 0ec92c71eb96c949527e788cdbf3734dcd43aa8a Mon Sep 17 00:00:00 2001
From: acrovato <a.crovato@uliege.be>
Date: Wed, 27 Apr 2022 14:25:11 +0200
Subject: [PATCH] Consistent names for TBB_INTERFACE_VERSION
---
CMake/FindTBB.cmake | 4 ++--
tbox/src/CMakeLists.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMake/FindTBB.cmake b/CMake/FindTBB.cmake
index 351f7f7..6f17524 100644
--- a/CMake/FindTBB.cmake
+++ b/CMake/FindTBB.cmake
@@ -263,8 +263,8 @@ ELSE()
MESSAGE(FATAL_ERROR "Cannot find version file in ${TBB_INCLUDE_DIRS}/tbb.")
ENDIF()
# If file has been found, also read the interface version
-STRING(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" _TBB_VERSION_INTERFACE "${_FILE}")
-SET(TBB_INTERFACE_VERSION ${_TBB_VERSION_INTERFACE})
+STRING(REGEX REPLACE ".*#define TBB_INTERFACE_VERSION ([0-9]+).*" "\\1" _TBB_INTERFACE_VERSION "${_FILE}")
+SET(TBB_INTERFACE_VERSION ${_TBB_INTERFACE_VERSION} CACHE STRING "" FORCE)
IF (_VERB)
MESSAGE(STATUS "TBB version: ${TBB_VERSION} (${TBB_INTERFACE_VERSION})")
ENDIF()
diff --git a/tbox/src/CMakeLists.txt b/tbox/src/CMakeLists.txt
index 9947874..9aedbbc 100644
--- a/tbox/src/CMakeLists.txt
+++ b/tbox/src/CMakeLists.txt
@@ -25,7 +25,7 @@ TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${PROJECT_SOURCE_DIR}/tbox/src)
FIND_PACKAGE(TBB REQUIRED)
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${TBB_CXX_FLAGS_DEBUG}")
TARGET_INCLUDE_DIRECTORIES(tbox PUBLIC ${TBB_INCLUDE_DIRS})
-IF(TBB_VERSION_INTERFACE LESS 11004)
+IF(TBB_INTERFACE_VERSION LESS 11004)
TARGET_COMPILE_DEFINITIONS(tbox PUBLIC TBB_PREVIEW_GLOBAL_CONTROL)
ENDIF()
TARGET_LINK_LIBRARIES(tbox ${TBB_LIBRARIES})
--
GitLab