From 48f516343129ad691d8c1a5d2ad6727f3c73f29a Mon Sep 17 00:00:00 2001
From: Collecting <collecting@citron-emu.org>
Date: Sat, 14 Feb 2026 17:21:08 -0500
Subject: [PATCH] Add dummy SPIRV-HeadersConfig.cmake for sirit

---
 .gitmodules                               |  3 +++
 externals/CMakeLists.txt                  | 16 ++++++++++------
 externals/SPIRV-Headers                   |  1 +
 externals/cmake/SPIRV-HeadersConfig.cmake |  5 +++++
 4 files changed, 19 insertions(+), 6 deletions(-)
 create mode 160000 externals/SPIRV-Headers
 create mode 100644 externals/cmake/SPIRV-HeadersConfig.cmake

diff --git a/.gitmodules b/.gitmodules
index e944a4e2f..8b01803d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -71,3 +71,6 @@
 [submodule "externals/spirv-tools"]
 	path = externals/spirv-tools
 	url = https://github.com/KhronosGroup/SPIRV-Tools.git
+[submodule "externals/SPIRV-Headers"]
+	path = externals/SPIRV-Headers
+	url = https://github.com/KhronosGroup/SPIRV-Headers
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 8e65c6c1a..780d87cf5 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -48,16 +48,20 @@ if (NOT MSVC)
         -Wno-string-concatenation)
 endif()
 
-# SPIRV-Headers (from sirit)
-set(SPIRV_HEADERS_SKIP_EXAMPLES ON)
-set(SPIRV_HEADERS_SKIP_INSTALL ON)
+# SPIRV-Headers
+if (NOT TARGET SPIRV-Headers)
+    add_subdirectory(SPIRV-Headers)
+endif()
 
-# Sirit (adds SPIRV-Headers as a dependency)
+# Sirit
+# Tell sirit to use our target
+set(SIRIT_USE_SYSTEM_SPIRV_HEADERS ON)
+list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 add_subdirectory(sirit)
 
 # SPIRV-Tools
-# Point SPIRV-Tools to the same source directory so it finds the headers
-set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sirit/externals/SPIRV-Headers")
+# Point to our new SPIRV-Headers
+set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers")
 set(SPIRV_HEADER_DIR "${SPIRV-Headers_SOURCE_DIR}")
 set(SPIRV_SKIP_TESTS ON)
 set(SPIRV_SKIP_EXECUTABLES ON)
diff --git a/externals/SPIRV-Headers b/externals/SPIRV-Headers
new file mode 160000
index 000000000..f31ca173e
--- /dev/null
+++ b/externals/SPIRV-Headers
@@ -0,0 +1 @@
+Subproject commit f31ca173eff866369e54d35e53375fadbabd58f4
diff --git a/externals/cmake/SPIRV-HeadersConfig.cmake b/externals/cmake/SPIRV-HeadersConfig.cmake
new file mode 100644
index 000000000..e44f34b43
--- /dev/null
+++ b/externals/cmake/SPIRV-HeadersConfig.cmake
@@ -0,0 +1,5 @@
+if (NOT TARGET SPIRV-Headers::SPIRV-Headers)
+    if (TARGET SPIRV-Headers)
+        add_library(SPIRV-Headers::SPIRV-Headers ALIAS SPIRV-Headers)
+    endif()
+endif()