Disabled TBBBind usage for oneTBB (#11386)

This commit is contained in:
Ilya Lavrenov
2022-04-01 19:09:06 +03:00
committed by GitHub
parent 2388f3b976
commit 8ae7c9f2cc
2 changed files with 7 additions and 2 deletions

View File

@@ -149,8 +149,6 @@ if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO" AND NOT ENABLE_SYST
message(FATAL_ERROR "Failed to find TBBConfig.cmake in ${TBBROOT} tree")
endif()
update_deps_cache(TBBBIND_2_5_DIR "${TBBBIND_2_5}/cmake" "Path to TBBBIND_2_5 cmake folder")
debug_message(STATUS "tbb=" ${TBB})
debug_message(STATUS "tbb_dir=" ${TBB_DIR})
debug_message(STATUS "tbbroot=" ${TBBROOT})
@@ -174,6 +172,8 @@ if(ENABLE_TBBBIND_2_5)
TARGET_PATH "${TEMP}/tbbbind_2_5"
ENVIRONMENT "TBBBIND_2_5_ROOT"
SHA256 "a67afeea8cf194f97968c800dab5b5459972908295242e282045d6b8953573c1")
elseif(ANDROID)
# don't have TBBBIND_2_5
elseif(LINUX AND X86_64)
RESOLVE_DEPENDENCY(TBBBIND_2_5
ARCHIVE_LIN "tbbbind_2_5_static_lin_v2.tgz"

View File

@@ -7,6 +7,11 @@ include(cmake/ie_parallel.cmake)
# pre-find TBB: need to provide TBB_IMPORTED_TARGETS used for installation
ov_find_tbb()
if(TBB_FOUND AND TBB_VERSION VERSION_GREATER_EQUAL 2021)
message(STATUS "Static tbbbind_2_5 package usage is disabled, since oneTBB is used")
set(ENABLE_TBBBIND_2_5 OFF)
endif()
if(ENABLE_TBBBIND_2_5)
# try to find prebuilt version of tbbbind_2_5
find_package(TBBBIND_2_5 QUIET)