Arm cross compilation (#12807)

* Fixed ARM out-of-box cross-compilation

* Improvements

* Fixed HDDL plugin
This commit is contained in:
Ilya Lavrenov authored and GitHub committed 2022-08-30 22:23:14 +04:00
1 parent 675cce8325
commit 8a4cb9b332
16 files changed
+97 -38

No files matched your search

@@ -117,7 +117,7 @@ endif()
if(LINUX AND NOT ARM
AND NOT AARCH64
AND LINUX_OS_NAME MATCHES "Ubuntu")
AND LINUX_OS_NAME MATCHES "(Ubuntu|Debian)")
if(DEFINED ENV{THIRDPARTY_SERVER_PATH})
set(IE_PATH_TO_DEPS "$ENV{THIRDPARTY_SERVER_PATH}")
+4 -4
View File
@@ -10,11 +10,11 @@ add_library(${TARGET_NAME} STATIC ${XLINK_SOURCES})
if(NOT WIN32)
target_include_directories(${TARGET_NAME}
PRIVATE
PRIVATE
"${LIBUSB_INCLUDE_DIR}")
target_link_libraries(${TARGET_NAME}
PUBLIC
PRIVATE
Threads::Threads
${LIBUSB_LIBRARY})
endif()
@@ -25,7 +25,7 @@ foreach(dir IN LISTS XLINK_INCLUDE)
endforeach()
target_compile_definitions(${TARGET_NAME}
PRIVATE
PRIVATE
__PC__
HAVE_STRUCT_TIMESPEC
_CRT_SECURE_NO_WARNINGS
@@ -34,7 +34,7 @@ target_compile_definitions(${TARGET_NAME}
if (ENABLE_MYRIAD_NO_BOOT)
target_compile_definitions(${TARGET_NAME}
PRIVATE
PRIVATE
NO_BOOT)
endif()
+21 -9
View File
@@ -28,19 +28,31 @@ if(WIN32)
else()
find_package(Threads REQUIRED)
find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "include" "libusb" "libusb-1.0")
find_library(LIBUSB_LIBRARY NAMES usb-1.0 PATH_SUFFIXES "lib")
# TODO: need to pre-detect libusb before enabling ENABLE_INTEL_MYRIAD_COMMON
# TODO: need to detect libusb before enabling ENABLE_INTEL_MYRIAD_COMMON
if(NOT LIBUSB_INCLUDE_DIR OR NOT LIBUSB_LIBRARY)
message(FATAL_ERROR "libusb is required, please install it")
find_package(PkgConfig QUIET)
if(PkgConfig_FOUND AND NOT ANDROID)
pkg_search_module(libusb REQUIRED
IMPORTED_TARGET GLOBAL
libusb-1.0)
if(libusb_FOUND)
set(LIBUSB_LIBRARY "PkgConfig::libusb" CACHE STRING "libusb-1.0 imported target")
set(LIBUSB_INCLUDE_DIR "" CACHE PATH "libusb-1.0 include dirs")
message(STATUS "libusb-1.0 (${libusb_VERSION}) is found at ${libusb_PREFIX}")
endif()
else()
find_path(LIBUSB_INCLUDE_DIR NAMES libusb.h PATH_SUFFIXES "include" "libusb" "libusb-1.0")
find_library(LIBUSB_LIBRARY NAMES usb-1.0 PATH_SUFFIXES "lib")
if(NOT LIBUSB_INCLUDE_DIR OR NOT LIBUSB_LIBRARY)
message(FATAL_ERROR "libusb is required, please install it")
endif()
endif()
set(XLINK_PLATFORM_INCLUDE ${XLINK_ROOT_DIR}/pc/MacOS)
list(APPEND XLINK_SOURCES "${XLINK_ROOT_DIR}/pc/MacOS/pthread_semaphore.c")
endif()
#This is for the Movidius team
set(XLINK_INCLUDE_DIRECTORIES
${XLINK_INCLUDE}
${LIBUSB_INCLUDE_DIR})
# This is for the Movidius team
set(XLINK_INCLUDE_DIRECTORIES ${XLINK_INCLUDE})
+7 -9
View File
@@ -23,7 +23,7 @@ target_include_directories(${TARGET_NAME}
${XLINK_PLATFORM_INCLUDE})
target_compile_definitions(${TARGET_NAME}
PRIVATE
PRIVATE
__PC__
HAVE_STRUCT_TIMESPEC
_CRT_SECURE_NO_WARNINGS
@@ -35,17 +35,17 @@ endif()
if(NOT WIN32)
target_compile_options(${TARGET_NAME}
PRIVATE
PRIVATE
-Wformat
-Wformat-security
-Wall)
if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.8.5)
target_compile_options(${TARGET_NAME}
PRIVATE
PRIVATE
-fstack-protector-strong)
else()
target_compile_options(${TARGET_NAME}
PRIVATE
PRIVATE
-fstack-protector)
endif()
@@ -57,19 +57,17 @@ if(NOT WIN32)
endif()
set_target_properties(${TARGET_NAME} PROPERTIES
POSITION_INDEPENDENT_CODE TRUE
COMPILE_PDB_NAME ${TARGET_NAME})
target_link_libraries(${TARGET_NAME}
PRIVATE
PRIVATE
XLink)
if(NOT WIN32)
target_link_libraries(${TARGET_NAME}
PUBLIC
PUBLIC
Threads::Threads
${CMAKE_DL_LIBS}
${LIBUSB_LIBRARY})
${CMAKE_DL_LIBS})
endif()
openvino_developer_export_targets(COMPONENT vpu TARGETS ${TARGET_NAME})