From ee99becbf02b91635338203e44b79c3814bddc2c Mon Sep 17 00:00:00 2001
From: Ellie Hermaszewska <ellieh@nvidia.com>
Date: Wed, 12 Feb 2025 12:43:47 +0800
Subject: Correct dependencies on core module source  (#6340)

* Publicly link core module sources

Closes https://github.com/shader-slang/slang/issues/6037

* format

* format

* remove unnecessary conditional

* comments

* neaten

* Only build embedded core modules when necessary

* Make dependencies on core module source more precise

* more precice dependencies on core module source

* Neaten
---
 source/slang-glsl-module/CMakeLists.txt | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'source/slang-glsl-module')

diff --git a/source/slang-glsl-module/CMakeLists.txt b/source/slang-glsl-module/CMakeLists.txt
index 40e88a4ed..95787f01d 100644
--- a/source/slang-glsl-module/CMakeLists.txt
+++ b/source/slang-glsl-module/CMakeLists.txt
@@ -1,8 +1,6 @@
 #
 # 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
     ${glsl_module_generated_header_dir}/slang-glsl-module-generated.h
@@ -16,27 +14,18 @@ add_custom_command(
     VERBATIM
 )
 
-set(glsl_module_common_args
+slang_add_target(
     .
     MODULE
-    FOLDER
-    generated
-    LINK_WITH_PRIVATE
-    core
+    FOLDER generated
+    LINK_WITH_PRIVATE core
     USE_EXTRA_WARNINGS
     EXPLICIT_SOURCE
-    ./slang-embedded-glsl-module.cpp
-)
-
-slang_add_target(
-    ${glsl_module_common_args}
-    TARGET_NAME slang-glsl-module
+        ./slang-embedded-glsl-module.cpp
+        ${glsl_module_generated_header}
     EXCLUDE_FROM_ALL
     EXTRA_COMPILE_DEFINITIONS_PRIVATE SLANG_SHARED_LIBRARY_TOOL
     EXPORT_SET_NAME SlangTargets
-    EXPLICIT_SOURCE ${glsl_module_generated_header}
     INCLUDE_DIRECTORIES_PRIVATE ${glsl_module_generated_header_dir}
     INSTALL
 )
-
-endif()
\ No newline at end of file
-- 
cgit v1.2.3