From a56c41848b8470c4aa4b4c08c1e77654bf5808fb Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Tue, 28 Jan 2025 15:12:53 -0800 Subject: [PATCH] CMake update to fix cases where DIRECTX_ARCH is not defined --- build/CompilerAndLinker.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake index da78a442..aa634f95 100644 --- 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()