Skip to content

CMake check for mismatch of toolset and arch setting #221

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.

Sign up for GitHub

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

Merged
walbourn merged 1 commit into from
Apr 15, 2025
Merged

CMake check for mismatch of toolset and arch setting #221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions build/CompilerAndLinker.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,17 @@ else()
set(DIRECTX_HOST_ARCH x64)
endif()

#--- Check DIRECTX_ARCH value
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
if(DIRECTX_ARCH MATCHES "x86|^arm$")
message(FATAL_ERROR "64-bit toolset mismatch detected for DIRECTX_ARCH setting")
endif()
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
if(DIRECTX_ARCH MATCHES "x64|arm64")
message(FATAL_ERROR "32-bit toolset mismatch detected for DIRECTX_ARCH setting")
endif()
endif()

#--- Build with Unicode Win32 APIs per "UTF-8 Everywhere"
if(WIN32)
list(APPEND COMPILER_DEFINES _UNICODE UNICODE)
Expand Down Expand Up @@ -166,10 +177,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
list(APPEND COMPILER_SWITCHES /Zc:lambda)
endif()

if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29)
AND (NOT VCPKG_TOOLCHAIN))
list(APPEND COMPILER_SWITCHES /external:W4)
endif()
# GDKX scenarios can't use external:W4

if((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.31)
AND (XBOX_CONSOLE_TARGET STREQUAL "durango"))
Expand Down
Loading