From 1d8f6f86d1a6d33ff6e6429206b94d72457e1378 Mon Sep 17 00:00:00 2001 From: Emil Imbert Villumsen Date: Fri, 13 Jun 2025 21:48:26 +0200 Subject: Fix SLANG_USE_SYSTEM_SPIRV_HEADERS (#7371) * Use aliased SPIRV-Headers::SPIRV-Headers to also work with an installed SPIRV-Headers SPIRV-Headers standalone is only defined when using sources directly. When consuming an installed SPIRV-Headers via find_package, the full SPIRV-Headers::SPIRV-Headers must be used. The full syntax is supported by both source and installed builds. * Fix SLANG_USE_SYSTEM_SPIRV_HEADERS - Use find_package to bring in SPIRV-Headers cmake targets - Set SPIRV-Headers_SOURCE_DIR as a workaround when including spirv-tools - Query cmake for SLANG_SPIRV_HEADERS_INCLUDE_DIR location, supporting default, SLANG_OVERRIDE_SPIRV_HEADERS_PATH and find_package builds. - Cleanup unnecessary SPIRV_HEADER_DIR (unconditionally overwritten in spirv-tools) --- source/slang-core-module/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/slang-core-module') diff --git a/source/slang-core-module/CMakeLists.txt b/source/slang-core-module/CMakeLists.txt index 600190161..d7f29be0a 100644 --- a/source/slang-core-module/CMakeLists.txt +++ b/source/slang-core-module/CMakeLists.txt @@ -61,7 +61,7 @@ set(core_module_source_common_args core slang-capability-defs slang-fiddle-output - SPIRV-Headers + SPIRV-Headers::SPIRV-Headers INCLUDE_DIRECTORIES_PRIVATE ../slang ${core_module_meta_output_dir} -- cgit v1.2.3