From c37b79b61e0a61ff5520acbceb5fccfc83dfdcbe Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <walbourn@users.noreply.github.com>
Date: Tue, 3 Sep 2024 11:42:44 -0700
Subject: [PATCH] CMake code review (#151)

---
 CMakeLists.txt                | 3 +--
 build/CompilerAndLinker.cmake | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 274471c..b031127 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,6 +41,7 @@ if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
 endif()
 
 include(GNUInstallDirs)
+include(build/CompilerAndLinker.cmake)
 
 #--- Library
 set(LIBRARY_HEADERS
@@ -216,8 +217,6 @@ if(MSVC)
     endforeach()
 endif()
 
-include(build/CompilerAndLinker.cmake)
-
 foreach(t IN LISTS TOOL_EXES ITEMS ${PROJECT_NAME})
   target_compile_definitions(${t} PRIVATE ${COMPILER_DEFINES})
   target_compile_options(${t} PRIVATE ${COMPILER_SWITCHES})
diff --git a/build/CompilerAndLinker.cmake b/build/CompilerAndLinker.cmake
index 1826feb..6fb5447 100644
--- a/build/CompilerAndLinker.cmake
+++ b/build/CompilerAndLinker.cmake
@@ -32,6 +32,13 @@ elseif(CMAKE_VS_PLATFORM_NAME_DEFAULT MATCHES "^[Aa][Rr][Mm]64EC$")
     set(DIRECTX_ARCH arm64ec)
 endif()
 
+#--- Determines host architecture
+if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "[Aa][Rr][Mm]64|aarch64|arm64")
+    set(DIRECTX_HOST_ARCH arm64)
+else()
+    set(DIRECTX_HOST_ARCH x64)
+endif()
+
 #--- Build with Unicode Win32 APIs per "UTF-8 Everywhere"
 if(WIN32)
   list(APPEND COMPILER_DEFINES _UNICODE UNICODE)