Detection of WoA ARM64 in all places (openvinotoolkit#15960)

andrei-cv · Mar 21, 2023 · 56b29c5 · 56b29c5
1 parent 1e73c9a
commit 56b29c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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 <ARM|ARM64> is passed
-  if(CMAKE_GENERATOR_PLATFORM STREQUAL "ARM64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
+  # if cmake -A <ARM|ARM64|x64|Win32> 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
@@ -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)