diff options
| author | Dario Mylonopoulos <32958057+ramenguy99@users.noreply.github.com> | 2025-01-24 12:15:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-24 19:15:02 +0800 |
| commit | ac174d260d90b66ebbc8264001a75b9527611cbc (patch) | |
| tree | db68e09e342190daba5d500467901c459fa20070 /source | |
| parent | a9ce7520e5f1b97b09e5de69455258bef55e10d2 (diff) | |
Fix static build and install (#6158)
* Add SLANG_ENABLE_RELEASE_LTO cmake option
* Fix cmake static build
* Disable install SlangTargets to avoid static build failing
Diffstat (limited to 'source')
| -rw-r--r-- | source/compiler-core/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/core/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/slang-rt/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/slang/CMakeLists.txt | 8 |
4 files changed, 11 insertions, 1 deletions
diff --git a/source/compiler-core/CMakeLists.txt b/source/compiler-core/CMakeLists.txt index 4d1bff17b..d3a88fddd 100644 --- a/source/compiler-core/CMakeLists.txt +++ b/source/compiler-core/CMakeLists.txt @@ -1,6 +1,7 @@ slang_add_target( . STATIC + EXPORT_MACRO_PREFIX SLANG EXCLUDE_FROM_ALL USE_EXTRA_WARNINGS LINK_WITH_PRIVATE core diff --git a/source/core/CMakeLists.txt b/source/core/CMakeLists.txt index 8228d0067..a8c19f4b5 100644 --- a/source/core/CMakeLists.txt +++ b/source/core/CMakeLists.txt @@ -1,6 +1,7 @@ slang_add_target( . STATIC + EXPORT_MACRO_PREFIX SLANG EXCLUDE_FROM_ALL USE_EXTRA_WARNINGS LINK_WITH_PRIVATE miniz lz4_static Threads::Threads ${CMAKE_DL_LIBS} diff --git a/source/slang-rt/CMakeLists.txt b/source/slang-rt/CMakeLists.txt index 5a0d2881e..b915cc5ef 100644 --- a/source/slang-rt/CMakeLists.txt +++ b/source/slang-rt/CMakeLists.txt @@ -1,7 +1,7 @@ if(SLANG_ENABLE_SLANGRT) slang_add_target( . - SHARED + ${SLANG_LIB_TYPE} # This compiles 'core' again with the SLANG_RT_DYNAMIC_EXPORT macro defined EXTRA_SOURCE_DIRS ${slang_SOURCE_DIR}/source/core USE_EXTRA_WARNINGS diff --git a/source/slang/CMakeLists.txt b/source/slang/CMakeLists.txt index 267498896..14064af83 100644 --- a/source/slang/CMakeLists.txt +++ b/source/slang/CMakeLists.txt @@ -28,8 +28,10 @@ add_custom_command( slang_add_target( slang-capability-defs OBJECT + EXPORT_MACRO_PREFIX SLANG USE_EXTRA_WARNINGS EXPLICIT_SOURCE ${SLANG_CAPABILITY_GENERATED_HEADERS} + EXPORT_TYPE_AS ${SLANG_LIB_TYPE} LINK_WITH_PRIVATE core INCLUDE_DIRECTORIES_PUBLIC "${SLANG_CAPABILITY_OUTPUT_DIR}" @@ -40,8 +42,10 @@ slang_add_target( slang_add_target( slang-capability-lookup OBJECT + EXPORT_MACRO_PREFIX SLANG USE_EXTRA_WARNINGS EXPLICIT_SOURCE ${SLANG_CAPABILITY_GENERATED_SOURCE} + EXPORT_TYPE_AS ${SLANG_LIB_TYPE} LINK_WITH_PRIVATE core slang-capability-defs EXCLUDE_FROM_ALL FOLDER generated @@ -157,10 +161,12 @@ add_custom_command( slang_add_target( slang-lookup-tables OBJECT + EXPORT_MACRO_PREFIX SLANG USE_EXTRA_WARNINGS EXPLICIT_SOURCE ${SLANG_LOOKUP_GENERATED_SOURCE} ${SLANG_SPIRV_CORE_GRAMMAR_SOURCE} + EXPORT_TYPE_AS ${SLANG_LIB_TYPE} LINK_WITH_PRIVATE core SPIRV-Headers EXCLUDE_FROM_ALL FOLDER generated @@ -274,6 +280,7 @@ else() slang_add_target( . ${SLANG_LIB_TYPE} + EXPORT_MACRO_PREFIX SLANG ${slang_link_args} ${slang_interface_args} NO_SOURCE @@ -291,6 +298,7 @@ else() slang_add_target( . ${SLANG_LIB_TYPE} + EXPORT_MACRO_PREFIX SLANG ${slang_link_args} ${slang_interface_args} ${slang_public_lib_args} |