[nrf fromtree] sysbuild: use ARGN instead of ARGV1

tejlmand · anangl · commit 0916cae2824c · 2024-07-01T10:00:35.000+02:00
Use of ARGV1 is undefined when number of arguments to function is less than 2. Therefore switch to ARGN which holds arguments beyond required arguments. If there are no optional arguments, then ARGN is just an empty list, thus making it safe to use. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no> (cherry picked from commit e65c632) (cherry picked from commit a6ed71f)
diff --git a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake
@@ -661,7 +661,7 @@ function(sysbuild_add_subdirectory source_dir)
       " (expected at most 2, got ${ARGC})"
     )
   endif()
-  set(binary_dir ${ARGV1})
+  set(binary_dir ${ARGN})
 
   # Update SYSBUILD_CURRENT_SOURCE_DIR in this scope, to support nesting
   # of sysbuild_add_subdirectory() and even regular add_subdirectory().

Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,7 @@ function(sysbuild_add_subdirectory source_dir)`
`661`	`661`	`" (expected at most 2, got ${ARGC})"`
`662`	`662`	`)`
`663`	`663`	`endif()`
`664`		`- set(binary_dir ${ARGV1})`
	`664`	`+ set(binary_dir ${ARGN})`
`665`	`665`
`666`	`666`	`# Update SYSBUILD_CURRENT_SOURCE_DIR in this scope, to support nesting`
`667`	`667`	`# of sysbuild_add_subdirectory() and even regular add_subdirectory().`