From a660d9c04a0818335e83e158a2b8205ad4bdb83f Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Wed, 6 Aug 2025 15:36:19 +0100 Subject: [PATCH] cmake: Always use bundled spirv-tools, regardless of `USE_SYSTEM_GLSLANG` --- externals/CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 4f6f1949e..66cbbd52e 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -415,6 +415,11 @@ if (ENABLE_VULKAN) add_subdirectory(spirv-headers EXCLUDE_FROM_ALL) endif() + # spirv-tools + # TODO: Implement USE_SYSTEM_SPIRV_TOOLS -OS + set(SPIRV_SKIP_EXECUTABLES ON) + add_subdirectory(spirv-tools EXCLUDE_FROM_ALL) + # glslang if(USE_SYSTEM_GLSLANG) find_package(glslang REQUIRED) @@ -426,8 +431,6 @@ if (ENABLE_VULKAN) get_target_property(GLSLANG_PREFIX glslang::SPIRV INTERFACE_INCLUDE_DIRECTORIES) target_include_directories(SPIRV SYSTEM INTERFACE "${GLSLANG_PREFIX}/glslang") else() - set(SPIRV_SKIP_EXECUTABLES ON) - add_subdirectory(spirv-tools EXCLUDE_FROM_ALL) set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "") set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "") set(ENABLE_SPVREMAPPER OFF CACHE BOOL "")