Fixed manylinux2014 with system TBB (#14076)

Co-authored-by: Chen Peter <peter.chen@intel.com>
This commit is contained in:
Ilya Lavrenov 2022-11-21 12:54:57 +04:00 committed by GitHub
parent 40089bdef7
commit cfb21de775
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 6 deletions

View File

@ -120,8 +120,8 @@ elif [ -f /etc/redhat-release ]; then
git \
git-lfs \
boost-devel \
python-pip \
python-devel \
python3-pip \
python3-devel \
libtool \
tbb-devel \
pugixml-devel \
@ -134,7 +134,6 @@ elif [ -f /etc/redhat-release ]; then
file \
zlib-devel \
gflags-devel \
python3-pip \
libva-devel
elif [ -f /etc/os-release ] && grep -q "raspbian" /etc/os-release; then
# Raspbian

View File

@ -45,7 +45,6 @@ macro(ov_find_package_tbb)
# don't set NO_CMAKE_PATH to allow -DTBB_DIR=XXX
# don't set NO_CMAKE_ENVIRONMENT_PATH to allow env TBB_DIR=XXX
set(_find_package_no_args NO_PACKAGE_ROOT_PATH
NO_CMAKE_ENVIRONMENT_PATH
NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_PACKAGE_REGISTRY
NO_CMAKE_SYSTEM_PATH
@ -112,7 +111,7 @@ macro(ov_find_package_tbb)
if(NOT TBB_FOUND)
# system TBB failed to be found
set(ENABLE_SYSTEM_TBB OFF)
set(ENABLE_SYSTEM_TBB OFF CACHE BOOL "" FORCE)
# TBB on system is not found, download prebuilt one
# if TBBROOT env variable is not defined

View File

@ -99,7 +99,6 @@ if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND
if(ENABLE_SYSTEM_TBB)
# TODO: what's about tbbbind for cases U22 with >= TBB 20221
# it seems that oneTBB from U22 distro does not contains tbbbind library
# the same situation for conda-forge distribution of TBB / oneTBB
# for system libraries we still need to install TBB libraries
# so, need to take locations of actual libraries and install them