From 5126d58ab2252357014df4136a4a1e07c7c2d5f4 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 15 Oct 2024 01:07:58 +0800 Subject: 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 --- source/slang/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt index 27600e3f8..cf12e6c24 100644 --- a/source/slang/CMakeLists.txt +++ b/source/slang/CMakeLists.txt @@ -179,8 +179,6 @@ set(slang_build_args # a warning is disabled for a memset boundary check. # everything looked fine and it is unclear why the checking fails $<$:-Wno-error=stringop-overflow> - # slang.h is in the project root, so include that directory in the interface - # for slang INCLUDE_DIRECTORIES_PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/slang-version-header EXPORT_MACRO_PREFIX SLANG EXPORT_TYPE_AS ${SLANG_LIB_TYPE} @@ -198,11 +196,13 @@ set(slang_link_args SPIRV-Headers ) set(slang_interface_args + # slang.h is in the project root, so include that directory in the interface + # for slang INCLUDE_DIRECTORIES_PUBLIC ${slang_SOURCE_DIR} ) set(slang_public_lib_args PUBLIC_HEADERS - ${slang_SOURCE_DIR}/slang*.h + ${slang_SOURCE_DIR}/include/slang*.h ${CMAKE_CURRENT_BINARY_DIR}/slang-version-header/*.h LINK_WITH_PRIVATE $,slang-embedded-stdlib,slang-no-embedded-stdlib> @@ -229,6 +229,7 @@ if(NOT SLANG_EMBED_STDLIB) ${slang_link_args} ${slang_interface_args} ${slang_public_lib_args} + INSTALL_COMPONENT generators ) add_library(slang-without-embedded-stdlib ALIAS slang) else() @@ -256,6 +257,9 @@ else() slang-common-objects slang-no-embedded-stdlib slang-embedded-stdlib-source + OUTPUT_DIR generators + FOLDER generators + INSTALL_COMPONENT generators ) slang_add_target( . -- cgit v1.2.3