CMake update to fix cases where DIRECTX_ARCH is not defined

microsoft · Jan 28, 2025 · a56c418 · a56c418
1 parent 8f79186
commit a56c418
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake
@@ -30,11 +30,11 @@ elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]64$")
     set(DIRECTX_ARCH arm64)
 elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]64EC$")
     set(DIRECTX_ARCH arm64ec)
-elseif((NOT (DEFINED DIRECTX_ARCH)) AND (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
-    if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
-        set(DIRECTX_ARCH x64)
-    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+elseif(NOT (DEFINED DIRECTX_ARCH))
+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "[Aa][Rr][Mm]64|aarch64|arm64")
         set(DIRECTX_ARCH arm64)
+    else()
+        set(DIRECTX_ARCH x64)
     endif()
 endif()