[cbuild2cmake] Add regions header file to link step dependencies

brondani · web-flow · commit ea69fa54b65b · 2025-11-14T08:22:15.000+01:00
diff --git a/pkg/maker/buildcontent.go b/pkg/maker/buildcontent.go
@@ -833,9 +833,12 @@ func (c *Cbuild) AddContextLanguage(language string) {
 
 func (c *Cbuild) LinkerOptions() (linkerVars string, linkerOptions string) {
 	linkerVars += "\nset(LD_SCRIPT \"" + c.AddRootPrefix(c.ContextRoot, c.BuildDescType.Linker.Script) + "\")"
+	linkerDeps := "\nset(LD_DEPS ${LD_SCRIPT}"
 	if len(c.BuildDescType.Linker.Regions) > 0 {
 		linkerVars += "\nset(LD_REGIONS \"" + c.AddRootPrefix(c.ContextRoot, c.BuildDescType.Linker.Regions) + "\")"
+		linkerDeps += " ${LD_REGIONS}"
 	}
+	linkerDeps += ")"
 	if len(c.BuildDescType.Linker.Define) > 0 {
 		linkerVars += "\nset(LD_SCRIPT_PP_DEFINES\n  "
 		linkerVars += ListCompileDefinitions(c.BuildDescType.Linker.Define, "\n  ")
@@ -866,7 +869,7 @@ func (c *Cbuild) LinkerOptions() (linkerVars string, linkerOptions string) {
 		linkerOptions += "\n  " + AddShellPrefix(c.AdjustRelativePath(option))
 	}
 	linkerOptions += "\n)"
-	linkerOptions += "\nset_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})"
+	linkerOptions += linkerDeps + "\nset_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS \"${LD_DEPS}\")"
 	if path.Ext(c.BuildDescType.Linker.Script) == ".src" || len(c.BuildDescType.Linker.Regions) > 0 || len(c.BuildDescType.Linker.Define) > 0 {
 		linkerScriptPP := strings.TrimSuffix(path.Base(c.BuildDescType.Linker.Script), ".src")
 		linkerVars += "\nset(LD_SCRIPT_PP \"${CMAKE_CURRENT_BINARY_DIR}/" + linkerScriptPP + "\")"
diff --git a/test/data/solutions/abstractions/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/abstractions/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -95,4 +95,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,--gc-sections"
   "SHELL:-Wl,--no-warn-rwx-segments"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/blanks/ref/project X.AC6 X+ARMCM0 X/CMakeLists.txt b/test/data/solutions/blanks/ref/project X.AC6 X+ARMCM0 X/CMakeLists.txt
@@ -81,4 +81,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--summary_stderr"
   "SHELL:--diag_suppress=L6314W"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/build-asm/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/build-asm/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -87,4 +87,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--summary_stderr"
   "SHELL:--diag_suppress=L6314W"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/build-asm/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/build-asm/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -85,7 +85,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/CLANG/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/build-asm/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/build-asm/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -85,4 +85,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/GCC/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/build-asm/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/build-asm/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -80,7 +80,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--semihosting"
   "SHELL:--map=${SOLUTION_ROOT}/out/project/ARMCM0/IAR/project.out.map"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/build-c/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/build-c/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -81,4 +81,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--summary_stderr"
   "SHELL:--diag_suppress=L6314W"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/build-c/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/build-c/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -80,7 +80,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/CLANG/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/build-c/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/build-c/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -84,4 +84,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/GCC/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/build-c/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/build-c/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -75,7 +75,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--semihosting"
   "SHELL:--map=${SOLUTION_ROOT}/out/project/ARMCM0/IAR/project.out.map"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/build-cpp/ref/project.AC6+ARMCM55/CMakeLists.txt b/test/data/solutions/build-cpp/ref/project.AC6+ARMCM55/CMakeLists.txt
@@ -96,4 +96,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--summary_stderr"
   "SHELL:--diag_suppress=L6314W"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/build-cpp/ref/project.CLANG+ARMCM55/CMakeLists.txt b/test/data/solutions/build-cpp/ref/project.CLANG+ARMCM55/CMakeLists.txt
@@ -91,7 +91,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM55/CLANG/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/build-cpp/ref/project.GCC+ARMCM55/CMakeLists.txt b/test/data/solutions/build-cpp/ref/project.GCC+ARMCM55/CMakeLists.txt
@@ -92,4 +92,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM55/GCC/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/build-cpp/ref/project.IAR+ARMCM55/CMakeLists.txt b/test/data/solutions/build-cpp/ref/project.IAR+ARMCM55/CMakeLists.txt
@@ -84,7 +84,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--semihosting"
   "SHELL:--map=${SOLUTION_ROOT}/out/project/ARMCM55/IAR/project.out.map"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/executes/ref/project.Release+ARMCM0/CMakeLists.txt b/test/data/solutions/executes/ref/project.Release+ARMCM0/CMakeLists.txt
@@ -81,4 +81,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--summary_stderr"
   "SHELL:--diag_suppress=L6314W"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/include-define/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/include-define/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -96,4 +96,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--summary_stderr"
   "SHELL:--diag_suppress=L6314W"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/include-define/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/include-define/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -94,7 +94,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/CLANG/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/include-define/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/include-define/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -94,4 +94,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/GCC/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/include-define/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/include-define/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -84,7 +84,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--semihosting"
   "SHELL:--map=${SOLUTION_ROOT}/out/project/ARMCM0/IAR/project.out.map"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/language-scope/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/language-scope/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -97,4 +97,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--summary_stderr"
   "SHELL:--diag_suppress=L6314W"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/language-scope/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/language-scope/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -95,7 +95,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/CLANG/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/language-scope/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/language-scope/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -100,4 +100,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/GCC/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/language-scope/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/language-scope/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -88,7 +88,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--semihosting"
   "SHELL:--map=${SOLUTION_ROOT}/out/project/ARMCM0/IAR/project.out.map"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/library-rtos/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/library-rtos/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -85,4 +85,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--summary_stderr"
   "SHELL:--diag_suppress=L6314W"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/library-rtos/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/library-rtos/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -84,7 +84,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-print-memory-usage"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/library-rtos/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/library-rtos/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -91,4 +91,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,--gc-sections"
   "SHELL:-Wl,--no-warn-rwx-segments"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/library-rtos/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/library-rtos/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -78,7 +78,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:${LD_CPU}"
   "SHELL:${_LS}\"${LD_SCRIPT_PP}\""
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -84,7 +84,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--entry=Reset_Handler"
   "SHELL:--diag_suppress=L6314W"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -83,7 +83,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-lcrt0"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -86,7 +86,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,--gc-sections"
   "SHELL:-Wl,--no-warn-rwx-segments"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/linker-pre-processing/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -78,7 +78,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:${_LS}\"${LD_SCRIPT_PP}\""
   "SHELL:${LD_MAP}"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/pre-include-oot/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include-oot/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -88,4 +88,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--summary_stderr"
   "SHELL:--diag_suppress=L6314W"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/pre-include-oot/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include-oot/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -86,7 +86,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/../pre-include-oot/out/project/ARMCM0/CLANG/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/pre-include-oot/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include-oot/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -88,4 +88,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,--gc-sections"
   "SHELL:-Wl,--no-warn-rwx-segments"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/pre-include-oot/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include-oot/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -81,7 +81,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:${_LS}\"${LD_SCRIPT_PP}\""
   "SHELL:--map=${SOLUTION_ROOT}/../pre-include-oot/out/project/ARMCM0/IAR/project.out.map"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/pre-include/ref/project.AC6+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include/ref/project.AC6+ARMCM0/CMakeLists.txt
@@ -88,4 +88,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--summary_stderr"
   "SHELL:--diag_suppress=L6314W"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/pre-include/ref/project.CLANG+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include/ref/project.CLANG+ARMCM0/CMakeLists.txt
@@ -87,7 +87,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/CLANG/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})
diff --git a/test/data/solutions/pre-include/ref/project.GCC+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include/ref/project.GCC+ARMCM0/CMakeLists.txt
@@ -87,4 +87,5 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/GCC/project.elf.map"
   "SHELL:-Wl,--gc-sections"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
diff --git a/test/data/solutions/pre-include/ref/project.IAR+ARMCM0/CMakeLists.txt b/test/data/solutions/pre-include/ref/project.IAR+ARMCM0/CMakeLists.txt
@@ -82,7 +82,8 @@ target_link_options(${CONTEXT} PUBLIC
   "SHELL:--semihosting"
   "SHELL:--map=${SOLUTION_ROOT}/out/project/ARMCM0/IAR/project.out.map"
 )
-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})
+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})
+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")
 
 # Linker script pre-processing
 add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})

Original file line number	Diff line number	Diff line change
`@@ -95,4 +95,5 @@ target_link_options(${CONTEXT} PUBLIC`
`95`	`95`	`"SHELL:-Wl,--gc-sections"`
`96`	`96`	`"SHELL:-Wl,--no-warn-rwx-segments"`
`97`	`97`	`)`
`98`		`-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})`
	`98`	`+set(LD_DEPS ${LD_SCRIPT})`
	`99`	`+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")`
Original file line number	Diff line number	Diff line change
`@@ -81,4 +81,5 @@ target_link_options(${CONTEXT} PUBLIC`
`81`	`81`	`"SHELL:--summary_stderr"`
`82`	`82`	`"SHELL:--diag_suppress=L6314W"`
`83`	`83`	`)`
`84`		`-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})`
	`84`	`+set(LD_DEPS ${LD_SCRIPT})`
	`85`	`+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")`
Original file line number	Diff line number	Diff line change
`@@ -87,4 +87,5 @@ target_link_options(${CONTEXT} PUBLIC`
`87`	`87`	`"SHELL:--summary_stderr"`
`88`	`88`	`"SHELL:--diag_suppress=L6314W"`
`89`	`89`	`)`
`90`		`-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})`
	`90`	`+set(LD_DEPS ${LD_SCRIPT})`
	`91`	`+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,8 @@ target_link_options(${CONTEXT} PUBLIC`
`85`	`85`	`"SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/CLANG/project.elf.map"`
`86`	`86`	`"SHELL:-Wl,--gc-sections"`
`87`	`87`	`)`
`88`		`-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})`
	`88`	`+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})`
	`89`	`+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")`
`89`	`90`
`90`	`91`	`# Linker script pre-processing`
`91`	`92`	`add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})`
Original file line number	Diff line number	Diff line change
`@@ -85,4 +85,5 @@ target_link_options(${CONTEXT} PUBLIC`
`85`	`85`	`"SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/GCC/project.elf.map"`
`86`	`86`	`"SHELL:-Wl,--gc-sections"`
`87`	`87`	`)`
`88`		`-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})`
	`88`	`+set(LD_DEPS ${LD_SCRIPT})`
	`89`	`+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,8 @@ target_link_options(${CONTEXT} PUBLIC`
`80`	`80`	`"SHELL:--semihosting"`
`81`	`81`	`"SHELL:--map=${SOLUTION_ROOT}/out/project/ARMCM0/IAR/project.out.map"`
`82`	`82`	`)`
`83`		`-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})`
	`83`	`+set(LD_DEPS ${LD_SCRIPT} ${LD_REGIONS})`
	`84`	`+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")`
`84`	`85`
`85`	`86`	`# Linker script pre-processing`
`86`	`87`	`add_custom_command(TARGET ${CONTEXT} PRE_LINK COMMAND ${CPP} ARGS ${CPP_ARGS_LD_SCRIPT} BYPRODUCTS ${LD_SCRIPT_PP})`
Original file line number	Diff line number	Diff line change
`@@ -84,4 +84,5 @@ target_link_options(${CONTEXT} PUBLIC`
`84`	`84`	`"SHELL:-Wl,-Map=${SOLUTION_ROOT}/out/project/ARMCM0/GCC/project.elf.map"`
`85`	`85`	`"SHELL:-Wl,--gc-sections"`
`86`	`86`	`)`
`87`		`-set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS ${LD_SCRIPT})`
	`87`	`+set(LD_DEPS ${LD_SCRIPT})`
	`88`	`+set_target_properties(${CONTEXT} PROPERTIES LINK_DEPENDS "${LD_DEPS}")`