Specify 'CMAKE_<LANG>_COMPILER_TARGET' reflecting CMAKE_SYSTEM_PROCESSOR (#157)

Author: MarkSchofield

.github/workflows/ci.yaml

@@ -40,7 +40,9 @@ jobs:
           - windows-ninja-msvc-arm64
           - windows-ninja-msvc-host
           - windows-ninja-clang-x64
+          - windows-ninja-clang-arm64
           - windows-ninja-clangcl-x64
+          - windows-ninja-clangcl-arm64
           - windows-fastbuild-msvc-x64
           - windows-vs2022-x64
           - windows-vs2022-arm64

Windows.Clang.toolchain.cmake

@@ -197,6 +197,22 @@ if(NOT CMAKE_VS_PLATFORM_TOOLSET_ARCHITECTURE)
     message(FATAL_ERROR "Unable identify compiler architecture for CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}")
 endif()
 
+# Map CMAKE_SYSTEM_PROCESSOR values to CMAKE_<LANG>_COMPILER_TARGET values that identifies the target architecture
+# for the compiler.
+foreach(LANG C CXX)
+    if(CMAKE_SYSTEM_PROCESSOR STREQUAL X86)
+        set(CMAKE_${LANG}_COMPILER_TARGET "i686-pc-windows-msvc")
+    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL AMD64)
+        set(CMAKE_${LANG}_COMPILER_TARGET "x86_64-pc-windows-msvc")
+    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL ARM)
+        set(CMAKE_${LANG}_COMPILER_TARGET "armv7a-pc-windows-msvc")
+    elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL ARM64)
+        set(CMAKE_${LANG}_COMPILER_TARGET "aarch64-pc-windows-msvc")
+    else()
+        message(FATAL_ERROR "Unable identify compiler architecture for CMAKE_SYSTEM_PROCESSOR ${CMAKE_SYSTEM_PROCESSOR}")
+    endif()
+endforeach()
+
 if(NOT CMAKE_C_COMPILER)
     set(TOOLCHAIN_C_COMPILER_EXE clang.exe)
     if(CMAKE_C_COMPILER_FRONTEND_VARIANT STREQUAL MSVC)

example/CMakePresets.json

@@ -125,13 +125,28 @@
         "CLANG_TIDY_CHECKS": "bugprone*,-bugprone-easily-swappable-parameters"
       }
     },
+    {
+      "name": "windows-ninja-clang-arm64",
+      "inherits": "windows-ninja-clang",
+      "cacheVariables": {
+        "CMAKE_SYSTEM_PROCESSOR": "ARM64",
+        "CLANG_TIDY_CHECKS": "bugprone*,-bugprone-easily-swappable-parameters"
+      }
+    },
     {
       "name": "windows-ninja-clangcl-x64",
       "inherits": "windows-ninja-clangcl",
       "cacheVariables": {
         "CMAKE_SYSTEM_PROCESSOR": "AMD64"
       }
     },
+    {
+      "name": "windows-ninja-clangcl-arm64",
+      "inherits": "windows-ninja-clangcl",
+      "cacheVariables": {
+        "CMAKE_SYSTEM_PROCESSOR": "ARM64"
+      }
+    },
     {
       "name": "ewdk",
       "displayName": "EWDK configuration",
@@ -235,10 +250,18 @@
       "name": "windows-ninja-clang-x64",
       "configurePreset": "windows-ninja-clang-x64"
     },
+    {
+      "name": "windows-ninja-clang-arm64",
+      "configurePreset": "windows-ninja-clang-arm64"
+    },
     {
       "name": "windows-ninja-clangcl-x64",
       "configurePreset": "windows-ninja-clangcl-x64"
     },
+    {
+      "name": "windows-ninja-clangcl-arm64",
+      "configurePreset": "windows-ninja-clangcl-arm64"
+    },
     {
       "name": "windows-fastbuild-msvc-x64",
       "configurePreset": "windows-fastbuild-msvc-x64"

example/build.ps1

@@ -6,9 +6,12 @@
 [CmdletBinding()]
 param (
     [ValidateSet('windows-ninja-msvc-x64', 'windows-ninja-msvc-x64-spectre', 'windows-ninja-msvc-x86',
-        'windows-ninja-msvc-arm64', 'windows-ninja-msvc-host', 'windows-ninja-clang-x64',
-        'windows-ninja-clangcl-x64', 'windows-fastbuild-msvc-x64', 'windows-vs2022-x64',
-        'windows-vs2022-arm64')]
+        'windows-ninja-msvc-arm64', 'windows-ninja-msvc-host',
+        'windows-ninja-clang-x64', 'windows-ninja-clang-arm64',
+        'windows-ninja-clangcl-x64', 'windows-ninja-clangcl-arm64',
+        'windows-fastbuild-msvc-x64',
+        'windows-vs2022-x64', 'windows-vs2022-arm64'
+        )]
     $Presets = @('windows-ninja-msvc-host'),
 
     [ValidateSet('Debug', 'Release', 'RelWithDebInfo')]