diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2024-12-05 17:45:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-05 09:45:24 +0000 |
| commit | 072cb60bb63e9f3d1c42fa18adcebb77bb4aa6ae (patch) | |
| tree | f123367640c89e8d112009ccd6fb389a6a24ee92 /source | |
| parent | 3f4b3112871bb978ee5104fd36321345da35a8d1 (diff) | |
Remove duplicate call to install() for libslang (#5767)
Closes https://github.com/shader-slang/slang/issues/5764
Also mention other installed targets in cmake config
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang-glslang/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/slang-rt/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/slang/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/slangc/CMakeLists.txt | 1 |
4 files changed, 10 insertions, 0 deletions
diff --git a/source/slang-glslang/CMakeLists.txt b/source/slang-glslang/CMakeLists.txt index d9d2dc45e..c457ad472 100644 --- a/source/slang-glslang/CMakeLists.txt +++ b/source/slang-glslang/CMakeLists.txt @@ -9,6 +9,7 @@ if(SLANG_ENABLE_SLANG_GLSLANG) LINK_WITH_PRIVATE glslang SPIRV SPIRV-Tools-opt INCLUDE_DIRECTORIES_PRIVATE ${slang_SOURCE_DIR}/include INSTALL + EXPORT_SET_NAME SlangTargets DEBUG_INFO_INSTALL_COMPONENT slang-glslang-debug-info ) # Our only interface is through what we define in source/slang-glslang, in the diff --git a/source/slang-rt/CMakeLists.txt b/source/slang-rt/CMakeLists.txt index 2dc56355e..5a0d2881e 100644 --- a/source/slang-rt/CMakeLists.txt +++ b/source/slang-rt/CMakeLists.txt @@ -10,5 +10,10 @@ if(SLANG_ENABLE_SLANGRT) EXPORT_MACRO_PREFIX SLANG_RT INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR}/include INSTALL + # This depends on unordered_dense in the header, so we can't export + # this via cmake without obligating ourselves to also install our + # bundled version of unordered_dense, give it this different export set + # name so we don't attempt to export it + EXPORT_SET_NAME SlangRTTargets ) endif() diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt index 0adaa04a7..267498896 100644 --- a/source/slang/CMakeLists.txt +++ b/source/slang/CMakeLists.txt @@ -233,6 +233,8 @@ set(slang_public_lib_args $<IF:$<BOOL:${SLANG_EMBED_CORE_MODULE}>,slang-embedded-core-module,slang-no-embedded-core-module> $<IF:$<BOOL:${SLANG_EMBED_CORE_MODULE_SOURCE}>,slang-embedded-core-module-source,slang-no-embedded-core-module-source> INSTALL + EXPORT_SET_NAME + SlangTargets ) # @@ -284,6 +286,7 @@ else() OUTPUT_DIR generators FOLDER generators INSTALL_COMPONENT generators + EXPORT_SET_NAME SlangGeneratorTargets ) slang_add_target( . diff --git a/source/slangc/CMakeLists.txt b/source/slangc/CMakeLists.txt index fba390b31..59d691bf4 100644 --- a/source/slangc/CMakeLists.txt +++ b/source/slangc/CMakeLists.txt @@ -6,5 +6,6 @@ if(SLANG_ENABLE_SLANGC) DEBUG_DIR ${slang_SOURCE_DIR} LINK_WITH_PRIVATE core slang Threads::Threads INSTALL + EXPORT_SET_NAME SlangTargets ) endif() |