diff options
| author | Yong He <yonghe@outlook.com> | 2025-01-31 21:13:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-31 21:13:17 -0800 |
| commit | 16b7be65d3edf99c420fe5147d7daed27224d473 (patch) | |
| tree | ce0f7b368b9bd183730314afd4fea21d6da11c43 | |
| parent | 5173c874892ab54bf1abd7ea21477e2d2aaa4365 (diff) | |
Fix build issue when SLANG_EMBED_CORE_MODULE is OFF. (#6243)
| -rw-r--r-- | source/slang-glsl-module/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/slangc/CMakeLists.txt | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/source/slang-glsl-module/CMakeLists.txt b/source/slang-glsl-module/CMakeLists.txt index d42b31ee6..40e88a4ed 100644 --- a/source/slang-glsl-module/CMakeLists.txt +++ b/source/slang-glsl-module/CMakeLists.txt @@ -1,6 +1,7 @@ # # Generate an embeddable glsl module # +if (${SLANG_EMBED_CORE_MODULE}) set(glsl_module_generated_header_dir ${CMAKE_CURRENT_BINARY_DIR}) set(glsl_module_generated_header @@ -37,3 +38,5 @@ slang_add_target( INCLUDE_DIRECTORIES_PRIVATE ${glsl_module_generated_header_dir} INSTALL ) + +endif()
\ No newline at end of file diff --git a/source/slangc/CMakeLists.txt b/source/slangc/CMakeLists.txt index 32ad02541..22547b686 100644 --- a/source/slangc/CMakeLists.txt +++ b/source/slangc/CMakeLists.txt @@ -1,3 +1,9 @@ +if (SLANG_EMBED_CORE_MODULE) + set(SLANG_GLSL_MODULE_DEPENDENCY REQUIRES slang-glsl-module) +else() + set(SLANG_GLSL_MODULE_DEPENDENCY ) +endif() + if(SLANG_ENABLE_SLANGC) slang_add_target( . @@ -5,7 +11,7 @@ if(SLANG_ENABLE_SLANGC) USE_FEWER_WARNINGS DEBUG_DIR ${slang_SOURCE_DIR} LINK_WITH_PRIVATE core slang Threads::Threads - REQUIRES slang-glsl-module + ${SLANG_GLSL_MODULE_DEPENDENCY} INSTALL EXPORT_SET_NAME SlangTargets ) |
