From 5ed77d8ee4d23c88b5a6bca5aba1f153822686f6 Mon Sep 17 00:00:00 2001
From: Mark Schofield <34426337+MarkSchofield@users.noreply.github.com>
Date: Sun, 1 Feb 2026 20:43:38 -0800
Subject: [PATCH] Align the CMAKE_TRY_COMPILE_PLATFORM_VARIABLES between
 *.toolchain.cmake files

---
 Windows.Clang.toolchain.cmake | 12 +++++++++++-
 Windows.MSVC.toolchain.cmake  |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Windows.Clang.toolchain.cmake b/Windows.Clang.toolchain.cmake
index 3f9488f..14fbb96 100644
--- a/Windows.Clang.toolchain.cmake
+++ b/Windows.Clang.toolchain.cmake
@@ -71,7 +71,17 @@ option(TOOLCHAIN_UPDATE_PROGRAM_PATH "Whether the toolchain should update CMAKE_
 option(TOOLCHAIN_ADD_VS_NINJA_PATH "Whether the toolchain should add the path to the VS Ninja to the CMAKE_SYSTEM_PROGRAM_PATH." ON)
 
 set(UNUSED ${CMAKE_TOOLCHAIN_FILE}) # Note: only to prevent cmake unused variable warninig
-list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES "CMAKE_SYSTEM_PROCESSOR")
+list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
+    CMAKE_SYSTEM_PROCESSOR
+    CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE
+    CMAKE_VS_PRODUCTS
+    CMAKE_VS_VERSION_PRERELEASE
+    CMAKE_VS_VERSION_RANGE
+    CMAKE_WINDOWS_KITS_10_DIR
+    VS_INSTALLATION_PATH
+    VS_INSTALLATION_VERSION
+    VS_PLATFORM_TOOLSET_VERSION
+)
 set(WIN32 1)
 
 # If `CMAKE_SYSTEM_PROCESSOR` isn't set, default to `CMAKE_HOST_SYSTEM_PROCESSOR`
diff --git a/Windows.MSVC.toolchain.cmake b/Windows.MSVC.toolchain.cmake
index 905e826..ffe1b25 100644
--- a/Windows.MSVC.toolchain.cmake
+++ b/Windows.MSVC.toolchain.cmake
@@ -86,6 +86,7 @@ list(APPEND CMAKE_TRY_COMPILE_PLATFORM_VARIABLES
     CMAKE_VS_PRODUCTS
     CMAKE_VS_VERSION_PRERELEASE
     CMAKE_VS_VERSION_RANGE
+    CMAKE_WINDOWS_KITS_10_DIR
     VS_INSTALLATION_PATH
     VS_INSTALLATION_VERSION
     VS_PLATFORM_TOOLSET_VERSION