From 116709451b43510d98afbb4b66f05f3d2db39250 Mon Sep 17 00:00:00 2001 From: Hiroshi Yamauchi Date: Tue, 13 Feb 2024 10:22:28 -0800 Subject: [PATCH] Support Windows ARM64 builds --- cmake/modules/DispatchWindowsSupport.cmake | 2 +- cmake/modules/SwiftSupport.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/modules/DispatchWindowsSupport.cmake b/cmake/modules/DispatchWindowsSupport.cmake index 87675a78a..750b3be11 100644 --- a/cmake/modules/DispatchWindowsSupport.cmake +++ b/cmake/modules/DispatchWindowsSupport.cmake @@ -6,7 +6,7 @@ function(dispatch_windows_arch_spelling arch var) set(${var} x64 PARENT_SCOPE) elseif(${arch} STREQUAL armv7) set(${var} arm PARENT_SCOPE) - elseif(${arch} STREQUAL aarch64) + elseif(${arch} STREQUAL aarch64 OR ${arch} STREQUAL ARM64) set(${var} arm64 PARENT_SCOPE) else() message(FATAL_ERROR "do not know MSVC spelling for ARCH: `${arch}`") diff --git a/cmake/modules/SwiftSupport.cmake b/cmake/modules/SwiftSupport.cmake index 702dd6c8f..a42b61e40 100644 --- a/cmake/modules/SwiftSupport.cmake +++ b/cmake/modules/SwiftSupport.cmake @@ -9,7 +9,7 @@ function(get_swift_host_arch result_var_name) if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") set("${result_var_name}" "x86_64" PARENT_SCOPE) - elseif ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "AArch64|aarch64|arm64") + elseif ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "AArch64|aarch64|arm64|ARM64") if(CMAKE_SYSTEM_NAME MATCHES Darwin) set("${result_var_name}" "arm64" PARENT_SCOPE) else()