Skip to content
Snippets Groups Projects
Commit 0ec92c71 authored by Adrien Crovato's avatar Adrien Crovato
Browse files

Consistent names for TBB_INTERFACE_VERSION

parent 18080994
No related branches found
No related tags found
1 merge request!6amfe v1.0.5
Pipeline #6198 passed
......@@ -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()
......
......@@ -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})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment