diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake index 22677a596e0..035c25b03bc 100644 --- a/cmake/dependencies.cmake +++ b/cmake/dependencies.cmake @@ -105,7 +105,7 @@ function(ov_download_tbb) TARGET_PATH "${TEMP}/tbb" ENVIRONMENT "TBBROOT" SHA256 "95b2f3b0b70c7376a0c7de351a355c2c514b42c4966e77e3e34271a599501008") - elseif((LINUX AND NOT ANDROID) AND AARCH64) + elseif(YOCTO_AARCH64) RESOLVE_DEPENDENCY(TBB ARCHIVE_LIN "keembay/tbb2020_38404_kmb_lic.tgz" TARGET_PATH "${TEMP}/tbb_yocto" @@ -197,7 +197,7 @@ if(ENABLE_OPENCV) set(OPENCV_BUILD "076") set(OPENCV_BUILD_YOCTO "772") - if(AARCH64) + if(YOCTO_AARCH64) if(DEFINED ENV{THIRDPARTY_SERVER_PATH}) set(IE_PATH_TO_DEPS "$ENV{THIRDPARTY_SERVER_PATH}") elseif(DEFINED THIRDPARTY_SERVER_PATH) @@ -235,7 +235,7 @@ if(ENABLE_OPENCV) VERSION_REGEX ".*_([0-9]+.[0-9]+.[0-9]+).*" SHA256 "3e162f96e86cba8836618134831d9cf76df0438778b3e27e261dedad9254c514") elseif(LINUX) - if(AARCH64) + if(YOCTO_AARCH64) set(OPENCV_SUFFIX "yocto_kmb") set(OPENCV_BUILD "${OPENCV_BUILD_YOCTO}") elseif(ARM) diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake index 14412697839..c3ea646ac26 100644 --- a/cmake/developer_package/target_flags.cmake +++ b/cmake/developer_package/target_flags.cmake @@ -69,6 +69,10 @@ if(UNIX AND NOT APPLE) set(LINUX ON) endif() +if(ENV{OECORE_NATIVE_SYSROOT} AND AARCH64) + set(YOCTO_AARCH64 ON) +endif() + if(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$") set(OV_COMPILER_IS_CLANG ON) endif() diff --git a/thirdparty/protobuf/CMakeLists.txt b/thirdparty/protobuf/CMakeLists.txt index d807b2aae8f..1ec4ce51100 100644 --- a/thirdparty/protobuf/CMakeLists.txt +++ b/thirdparty/protobuf/CMakeLists.txt @@ -76,7 +76,7 @@ if(NOT protobuf_BUILD_PROTOC_BINARIES) set(HOST_PROTOC_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/host_protoc_install") set(HOST_PROTOC_PREFIX_DIR "${CMAKE_CURRENT_BINARY_DIR}/host_protoc_root") - if(DEFINED ENV{OECORE_NATIVE_SYSROOT}) + if(YOCTO_AARCH64) # need to unset several variables which can set env to cross-environment foreach(var SDKTARGETSYSROOT CONFIG_SITE OECORE_NATIVE_SYSROOT OECORE_TARGET_SYSROOT OECORE_ACLOCAL_OPTS OECORE_BASELIB OECORE_TARGET_ARCH OECORE_TARGET_OS CC CXX