Skip to content

Commit 1e6d18c

Browse files
authored
CMake update to fix cases where DIRECTX_ARCH is not defined (#193)
1 parent 7069d77 commit 1e6d18c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

build/CompilerAndLinker.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]64$")
3030
set(DIRECTX_ARCH arm64)
3131
elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]64EC$")
3232
set(DIRECTX_ARCH arm64ec)
33-
elseif((NOT (DEFINED DIRECTX_ARCH)) AND (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
34-
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
35-
set(DIRECTX_ARCH x64)
36-
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
33+
elseif(NOT (DEFINED DIRECTX_ARCH))
34+
if(CMAKE_SYSTEM_PROCESSOR MATCHES "[Aa][Rr][Mm]64|aarch64|arm64")
3735
set(DIRECTX_ARCH arm64)
36+
else()
37+
set(DIRECTX_ARCH x64)
3838
endif()
3939
endif()
4040

@@ -104,6 +104,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")
104104
if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0))
105105
list(APPEND COMPILER_SWITCHES /ZH:SHA_256)
106106
endif()
107+
107108
if(WINDOWS_STORE)
108109
list(APPEND COMPILER_DEFINES _SILENCE_CLANG_COROUTINE_MESSAGE)
109110
endif()

0 commit comments

Comments
 (0)