Arm cross compilation (#12807)
* Fixed ARM out-of-box cross-compilation * Improvements * Fixed HDDL plugin
This commit is contained in:
1 parent
675cce8325
commit
8a4cb9b332
16 files changed
+97
-38
No files matched your search
@@ -19,12 +19,16 @@ endif()
|
||||
|
||||
if(PYTHON_VERSION_MINOR EQUAL 6)
|
||||
set(clang_version 10)
|
||||
elseif(PYTHON_VERSION_MINOR EQUAL 7)
|
||||
set(clang_version 11)
|
||||
elseif(PYTHON_VERSION_MINOR EQUAL 8)
|
||||
set(clang_version 12)
|
||||
elseif(PYTHON_VERSION_MINOR EQUAL 9)
|
||||
set(clang_version 12)
|
||||
elseif(PYTHON_VERSION_MINOR EQUAL 10)
|
||||
set(clang_version 14)
|
||||
else()
|
||||
message(WARNING "Cannot suggest clang package for python ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
|
||||
endif()
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
clang==10.0.1; python_version == '3.6'
|
||||
clang==11.1.0; python_version == '3.7'
|
||||
clang==12.0.1; python_version == '3.8'
|
||||
clang==12.0.1; python_version == '3.9'
|
||||
clang==14.0; python_version == '3.10'
|
||||
|
||||
@@ -120,7 +120,7 @@ set(IE_EXTRA_MODULES "" CACHE STRING "Extra paths for extra modules to include i
|
||||
ie_dependent_option(ENABLE_TBB_RELEASE_ONLY "Only Release TBB libraries are linked to the Inference Engine binaries" ON "THREADING MATCHES TBB;LINUX" OFF)
|
||||
|
||||
get_linux_name(LINUX_OS_NAME)
|
||||
if(LINUX_OS_NAME MATCHES "^Ubuntu [0-9]+\.[0-9]+$")
|
||||
if(LINUX_OS_NAME MATCHES "(Ubuntu|Debian)")
|
||||
# Debian packages are enabled on Ubuntu systems
|
||||
# so, system TBB / pugixml can be tried for usage
|
||||
set(ENABLE_SYSTEM_LIBS_DEFAULT ON)
|
||||
|
||||
@@ -195,9 +195,10 @@ endif()
|
||||
|
||||
_ov_find_dependency(Threads)
|
||||
|
||||
set(ENABLE_INTEL_GNA "@ENABLE_INTEL_GNA@")
|
||||
set(ENABLE_INTEL_GNA_SHARED "@BUILD_SHARED_LIBS@")
|
||||
if(ENABLE_INTEL_GNA AND NOT ENABLE_INTEL_GNA_SHARED AND NOT libGNA_FOUND)
|
||||
set(_OV_ENABLE_OPENVINO_BUILD_SHARED "@BUILD_SHARED_LIBS@")
|
||||
|
||||
set(_OV_ENABLE_INTEL_GNA "@ENABLE_INTEL_GNA@")
|
||||
if(_OV_ENABLE_INTEL_GNA AND NOT _OV_ENABLE_OPENVINO_BUILD_SHARED AND NOT libGNA_FOUND)
|
||||
set_and_check(GNA_PATH "@PACKAGE_GNA_PATH@")
|
||||
_ov_find_dependency(libGNA
|
||||
COMPONENTS KERNEL
|
||||
@@ -206,6 +207,20 @@ if(ENABLE_INTEL_GNA AND NOT ENABLE_INTEL_GNA_SHARED AND NOT libGNA_FOUND)
|
||||
NO_CMAKE_FIND_ROOT_PATH
|
||||
NO_DEFAULT_PATH)
|
||||
endif()
|
||||
unset(_OV_ENABLE_INTEL_GNA)
|
||||
|
||||
set(_OV_ENABLE_INTEL_MYRIAD "@ENABLE_INTEL_MYRIAD@")
|
||||
if(_OV_ENABLE_INTEL_MYRIAD AND NOT _OV_ENABLE_OPENVINO_BUILD_SHARED)
|
||||
find_package(PkgConfig QUIET)
|
||||
if(PkgConfig_FOUND AND NOT ANDROID)
|
||||
pkg_search_module(libusb REQUIRED
|
||||
IMPORTED_TARGET GLOBAL
|
||||
libusb-1.0)
|
||||
message(STATUS "libusb-1.0 (${libusb_VERSION}) is found at ${libusb_PREFIX}")
|
||||
endif()
|
||||
endif()
|
||||
unset(_OV_ENABLE_INTEL_MYRIAD)
|
||||
unset(_OV_ENABLE_OPENVINO_BUILD_SHARED)
|
||||
|
||||
if(NOT TARGET openvino)
|
||||
set(_ov_as_external_package ON)
|
||||
|
||||
Reference in new issue
Block a user