From d5ff50963c6ee51f611776d869c73e698e268f8b Mon Sep 17 00:00:00 2001
From: Brad Grantham <brad@lunarg.com>
Date: Wed, 29 Jan 2025 11:11:07 -0800
Subject: [PATCH 1/4] print cmake version as part of build

---
 .github/workflows/ci_build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index 14c774be9e..629d31ab3e 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -119,6 +119,7 @@ jobs:
         git diff --exit-code
     - name: Run build script
       run: |
+        cmake --version
         python scripts\build.py --skip-check-code-style --config ${{ matrix.config.type }} --parallel 0
     - name: Prepare artifacts
       run: |

From dc9c70522698332749905260f85bb0ad885c9bfd Mon Sep 17 00:00:00 2001
From: Brad Grantham <brad@lunarg.com>
Date: Wed, 29 Jan 2025 12:54:59 -0800
Subject: [PATCH 2/4] Require CMake 3.22

---
 .github/workflows/ci_build.yml | 3 +++
 external/SPIRV-Reflect         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index 629d31ab3e..1183623005 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -94,6 +94,9 @@ jobs:
             cc: "cl", cxx: "cl"
           }
     steps:
+    - uses: lukka/get-cmake@latest
+      with:
+        cmakeVersion: 3.22
     - name: Require Python 3.10
       uses: actions/setup-python@v5
       with:
diff --git a/external/SPIRV-Reflect b/external/SPIRV-Reflect
index 281b55edb6..b4dc70d8e6 160000
--- a/external/SPIRV-Reflect
+++ b/external/SPIRV-Reflect
@@ -1 +1 @@
-Subproject commit 281b55edb67b1f2e61e1dc92fdc42a650da05d83
+Subproject commit b4dc70d8e6ac30c719a2d05b8ad05e1d277c92b4

From e614a62b997a05044b9044cc6a62457eb3d818dd Mon Sep 17 00:00:00 2001
From: Brad Grantham <brad@lunarg.com>
Date: Wed, 29 Jan 2025 13:01:06 -0800
Subject: [PATCH 3/4] extend CMP0135 to CMake 3.24 and remove directive causing
 an issue

---
 cmake/FindDXC.cmake | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cmake/FindDXC.cmake b/cmake/FindDXC.cmake
index bac3e96817..2e7361c234 100644
--- a/cmake/FindDXC.cmake
+++ b/cmake/FindDXC.cmake
@@ -28,7 +28,7 @@ if (${D3D12_SUPPORT})
         set(DXC_SDK_URL "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2407/dxc_2024_07_31.zip")
         
         # Suppress warning on newer versions of CMake related to FetchContent file timestamp behavior.
-        if (${CMAKE_VERSION} VERSION_GREATER "3.24")
+        if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.24")
             cmake_policy(SET CMP0135 NEW)
         endif()
 
@@ -38,7 +38,6 @@ if (${D3D12_SUPPORT})
           DXC_SDK
           URL        ${DXC_SDK_URL}
           SOURCE_DIR ${DXC_SDK_DIR}
-          DOWNLOAD_EXTRACT_TIMESTAMP OFF
         )
         FetchContent_MakeAvailable(DXC_SDK)
         

From 689502b3368a871601b29a17cdb93fbc6e7c5234 Mon Sep 17 00:00:00 2001
From: Brad Grantham <brad@lunarg.com>
Date: Wed, 29 Jan 2025 13:04:45 -0800
Subject: [PATCH 4/4] Remove requirement for 3.22

---
 .github/workflows/ci_build.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/ci_build.yml b/.github/workflows/ci_build.yml
index 1183623005..629d31ab3e 100644
--- a/.github/workflows/ci_build.yml
+++ b/.github/workflows/ci_build.yml
@@ -94,9 +94,6 @@ jobs:
             cc: "cl", cxx: "cl"
           }
     steps:
-    - uses: lukka/get-cmake@latest
-      with:
-        cmakeVersion: 3.22
     - name: Require Python 3.10
       uses: actions/setup-python@v5
       with: