diff options
| author | Emil Imbert Villumsen <emimvi@gmail.com> | 2025-06-13 21:48:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-13 12:48:26 -0700 |
| commit | 1d8f6f86d1a6d33ff6e6429206b94d72457e1378 (patch) | |
| tree | e5ae1ec38bc4d8703a9bed809fdd4cf05749b7c5 /source/slang-core-module | |
| parent | debdc7251ff31b82ea221893c6475e96dbe4dc16 (diff) | |
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)
Diffstat (limited to 'source/slang-core-module')
| -rw-r--r-- | source/slang-core-module/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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} |