fixed TBB
This commit is contained in:
@@ -146,7 +146,7 @@ if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT ENABLE_SYST
|
||||
# custom downloaded or user provided TBB
|
||||
update_deps_cache(TBB_DIR "${TBBROOT}/cmake" "Path to TBB cmake folder")
|
||||
else()
|
||||
message(FATAL_ERROR "Failed to find TBBConfig.cmake in ${TBBROOT} tree")
|
||||
message(WARNING "Failed to find TBBConfig.cmake in ${TBBROOT} tree. Custom TBBConfig.cmake will be used")
|
||||
endif()
|
||||
|
||||
update_deps_cache(TBBBIND_2_5_DIR "${TBBBIND_2_5}/cmake" "Path to TBBBIND_2_5 cmake folder")
|
||||
|
||||
@@ -23,6 +23,9 @@ else()
|
||||
unset(IE_OWN_TBB_CONFIG)
|
||||
endif()
|
||||
|
||||
unset(TBB_DIR)
|
||||
unset(TBB_DIR CACHE)
|
||||
|
||||
find_package(TBB
|
||||
CONFIG
|
||||
PATHS ${TBBROOT}/cmake
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
macro(ov_find_tbb)
|
||||
if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT TBB_FOUND)
|
||||
find_package(TBB COMPONENTS tbb tbbmalloc)
|
||||
find_package(TBB QUIET COMPONENTS tbb tbbmalloc)
|
||||
|
||||
# try to find TBB via custom scripts if have not found by default
|
||||
if(NOT TBB_FOUND AND IEDevScripts_DIR)
|
||||
@@ -19,6 +19,8 @@ macro(ov_find_tbb)
|
||||
PATHS ${IEDevScripts_DIR}
|
||||
NO_CMAKE_FIND_ROOT_PATH
|
||||
NO_DEFAULT_PATH)
|
||||
else()
|
||||
message(STATUS "TBB (${TBB_VERSION}) is found at ${TBB_DIR}")
|
||||
endif()
|
||||
|
||||
# WA for oneTBB: it does not define TBB_IMPORTED_TARGETS
|
||||
|
||||
Reference in New Issue
Block a user