diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2024-10-15 01:07:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-14 10:07:58 -0700 |
| commit | 5126d58ab2252357014df4136a4a1e07c7c2d5f4 (patch) | |
| tree | 33ff345f9b3dcec0153ba3733aa3e0bbbd14059f /cmake | |
| parent | 2e08f33386b65502e16eea33613bddf98ab8b440 (diff) | |
Fix release build failure (#5285)
* Fix race condition for building stdlib headers
Fixes https://github.com/shader-slang/slang/issues/5270
* Generalize slangtarget install options
* Install slang-without-embedded-stdlib with generators
---------
Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/SlangTarget.cmake | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/cmake/SlangTarget.cmake b/cmake/SlangTarget.cmake index 9e3fe11cd..bf1abe3a9 100644 --- a/cmake/SlangTarget.cmake +++ b/cmake/SlangTarget.cmake @@ -390,35 +390,29 @@ function(slang_add_target dir type) # # Mark for installation # - if(ARG_INSTALL OR ARG_INSTALL_COMPONENT) - set(component_args) - if(ARG_INSTALL_COMPONENT) - set(component_args COMPONENT ${ARG_INSTALL_COMPONENT}) - endif() - set(exclude_arg) - if(NOT ARG_INSTALL) - set(exclude_arg EXCLUDE_FROM_ALL) - endif() + macro(i) install( TARGETS ${target} EXPORT SlangTargets ARCHIVE DESTINATION ${archive_subdir} - ${component_args} - ${exclude_arg} + ${ARGN} LIBRARY DESTINATION ${library_subdir} - ${component_args} - ${exclude_arg} + ${ARGN} RUNTIME DESTINATION ${runtime_subdir} - ${component_args} - ${exclude_arg} + ${ARGN} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ${component_args} - ${exclude_arg} + ${ARGN} ) + endmacro() + if(ARG_INSTALL) + i() + endif() + if(ARG_INSTALL_COMPONENT) + i(EXCLUDE_FROM_ALL COMPONENT ${ARG_INSTALL_COMPONENT}) endif() endfunction() |