Updated ia32 toolchain with system / processor (#12784)

* Updated ia32 toolchain with system / processor

* Allow pkg-config during cross-compilation

* added error message

* Search TBB using tbb.pc as well

* WA

* Fix for yocto

* Added print

* Use tbb.pc only when system libs are enabled

* Improved OpenVINOConfig.cmake

* Don't find pkg-config as required
This commit is contained in:
Ilya Lavrenov
2022-09-01 14:33:47 +04:00
committed by GitHub
parent 6c4cc81465
commit e19df6f85f
15 changed files with 176 additions and 67 deletions

View File

@@ -33,7 +33,7 @@ if(NOT ANDROID)
zlib)
if(zlib_FOUND)
add_library(zlib::zlib ALIAS PkgConfig::zlib)
message(STATUS "zlib (${zlib_VERSION}) is found at ${zlib_PREFIX}")
message(STATUS "${PKG_CONFIG_EXECUTABLE}: zlib (${zlib_VERSION}) is found at ${zlib_PREFIX}")
endif()
endif()
endif()

View File

@@ -33,15 +33,22 @@ if(NOT DEFINED protobuf_MSVC_STATIC_RUNTIME)
set(protobuf_MSVC_STATIC_RUNTIME OFF CACHE BOOL "Link protobuf to static runtime libraries" FORCE)
endif()
if(CMAKE_CROSSCOMPILING)
# WA: see CVS-90227 about X86
if(CMAKE_CROSSCOMPILING AND NOT X86)
find_host_program(SYSTEM_PROTOC protoc PATHS ENV PATH)
if(SYSTEM_PROTOC)
execute_process(
COMMAND ${SYSTEM_PROTOC} --version
OUTPUT_VARIABLE PROTOC_VERSION
ERROR_VARIABLE error_message
RESULT_VARIABLE exit_code
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT exit_code EQUAL 0)
message(FATAL_ERROR "Internal error: failed to get ${SYSTEM_PROTOC} version ${error_message}")
endif()
string(REPLACE " " ";" PROTOC_VERSION ${PROTOC_VERSION})
list(GET PROTOC_VERSION -1 PROTOC_VERSION)