cmake: Always use bundled spirv-tools, regardless of USE_SYSTEM_GLSLANG

This commit is contained in:
OpenSauce04 2025-08-06 15:36:19 +01:00
parent f02a25f15f
commit a660d9c04a

View File

@ -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 "")