Skip to content

Commit

Permalink
CMake update to fix cases where DIRECTX_ARCH is not defined
Browse files Browse the repository at this point in the history
  • Loading branch information
walbourn committed Jan 28, 2025
1 parent 2bcf165 commit b2f6daa
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions build/CompilerAndLinker.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -104,6 +104,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|IntelLLVM")
if(MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16.0))
list(APPEND COMPILER_SWITCHES /ZH:SHA_256)
endif()

if(WINDOWS_STORE)
list(APPEND COMPILER_DEFINES _SILENCE_CLANG_COROUTINE_MESSAGE)
endif()
Expand Down

0 comments on commit b2f6daa

Please sign in to comment.