1 files changed, 13 insertions, 27 deletions
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index f22b8753f8..434e6fb100 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -148,22 +148,23 @@ if (ENABLE_SDL2)
 endif()
 
 # SPIRV Headers
-# We only need SPIRV-Headers iff spirv-tools is bundled
-if (SPIRV-Tools_FORCE_BUNDLED OR CPMUTIL_FORCE_BUNDLED)
-    set(NEED_SPIRV_HEADERS ON)
+AddJsonPackage(spirv-headers)
+
+# Sirit
+if (YUZU_USE_BUNDLED_SIRIT)
+    AddJsonPackage(sirit-ci)
 else()
-    find_package(SPIRV-Tools MODULE QUIET)
-    if (NOT SPIRV-Tools_FOUND)
-        set(NEED_SPIRV_HEADERS ON)
-    else()
-        set(NEED_SPIRV_HEADERS OFF)
+    AddJsonPackage(sirit)
+    if(MSVC AND USE_CCACHE AND sirit_ADDED)
+        get_target_property(_opts sirit COMPILE_OPTIONS)
+        list(FILTER _opts EXCLUDE REGEX "/Zi")
+        list(APPEND _opts "/Z7")
+        set_target_properties(siritobj PROPERTIES COMPILE_OPTIONS "${_opts}")
+    elseif(MSVC AND CXX_CLANG)
+        target_compile_options(siritobj PRIVATE -Wno-error=unused-command-line-argument)
     endif()
 endif()
 
-if (NEED_SPIRV_HEADERS)
-    AddJsonPackage(spirv-headers)
-endif()
-
 # SPIRV Tools
 AddJsonPackage(spirv-tools)
 
@@ -205,21 +206,6 @@ if (VulkanMemoryAllocator_ADDED)
     endif()
 endif()
 
-# Sirit
-if (YUZU_USE_BUNDLED_SIRIT)
-    AddJsonPackage(sirit-ci)
-else()
-    AddJsonPackage(sirit)
-    if(MSVC AND USE_CCACHE AND sirit_ADDED)
-        get_target_property(_opts sirit COMPILE_OPTIONS)
-        list(FILTER _opts EXCLUDE REGEX "/Zi")
-        list(APPEND _opts "/Z7")
-        set_target_properties(siritobj PROPERTIES COMPILE_OPTIONS "${_opts}")
-    elseif(MSVC AND CXX_CLANG)
-        target_compile_options(siritobj PRIVATE -Wno-error=unused-command-line-argument)
-    endif()
-endif()
-
 # httplib
 if (ENABLE_WEB_SERVICE OR ENABLE_QT_UPDATE_CHECKER)
     AddJsonPackage(httplib)