Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake update to fix cases where DIRECTX_ARCH is not defined #571

Merged
merged 1 commit into from
Jan 29, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 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
Loading