From 893ee2882f779260ce2f65a9cb9d9abe785ea1e3 Mon Sep 17 00:00:00 2001 From: darktux Date: Mon, 8 Apr 2024 00:30:51 +0200 Subject: [PATCH] Improve SPIRV-Headers loading behavior --- externals/CMakeLists.txt | 6 ++++++ externals/sirit | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 7d5076da87..f6ffcb3319 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -14,6 +14,12 @@ set(BUILD_SHARED_LIBS OFF) # Skip install rules for all externals set_directory_properties(PROPERTIES EXCLUDE_FROM_ALL ON) +# SPIRV Headers +find_package(SPIRV-Headers) +if (NOT TARGET SPIRV-Headers::SPIRV-Headers) + add_subdirectory(SPIRV-Headers) +endif() + # Xbyak (also used by Dynarmic, so needs to be added first) if ((ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) AND NOT TARGET xbyak::xbyak) add_subdirectory(xbyak) diff --git a/externals/sirit b/externals/sirit index ab75463999..f58c58df50 160000 --- a/externals/sirit +++ b/externals/sirit @@ -1 +1 @@ -Subproject commit ab75463999f4f3291976b079d42d52ee91eebf3f +Subproject commit f58c58df50e20b39f090f4d7f1791161d70416ad