From 3e7867880e07fbc79cee88ceb8149f79efa8ed01 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 27 Feb 2023 00:33:08 +0400 Subject: [PATCH] Detection of WoA ARM64 in all places --- cmake/developer_package/target_flags.cmake | 6 +++--- samples/cpp/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/developer_package/target_flags.cmake b/cmake/developer_package/target_flags.cmake index 0d2117d55e0432..0a37c910ae8888 100644 --- a/cmake/developer_package/target_flags.cmake +++ b/cmake/developer_package/target_flags.cmake @@ -20,7 +20,7 @@ if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") set(arch_flag X86_64) elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*") set(arch_flag X86) -elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*)") +elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*|ARM64.*)") set(arch_flag AARCH64) elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)") set(arch_flag ARM) @@ -31,8 +31,8 @@ endif() set(HOST_${arch_flag} ON) macro(_ie_process_msvc_generator_platform arch_flag) - # if cmake -A is passed - if(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64") + # if cmake -A is passed + if(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64") set(AARCH64 ON) elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM") set(ARM ON) diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index 72bfa5cfd34ed0..693c9b2df5e9a8 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -69,7 +69,7 @@ if(APPLE) set(CMAKE_MACOSX_RPATH ON) endif() -if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*)") +if(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64.*|aarch64.*|AARCH64.*|ARM64.*)") set(AARCH64 ON) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)") set(ARM ON)