sysbuild: Support SB_CONF_FILE and SB_EXTRA_CONF_FILE as lists

These variables need to be converted to absolute paths internally, but so far this has only worked when each value consisted of a single path. Add a common loop to handle lists of paths. As a bonus, run `string(CONFIGURE)` to expand those variables in the same way as the regular CONF_FILE and EXTRA_CONF_FILE. Signed-off-by: Grzegorz Swiderski <[email protected]>
zephyrproject-rtos · Oct 11, 2023 · 45c369f · 45c369f
1 parent 3ee0f30
commit 45c369f
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake b/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake
@@ -24,22 +24,23 @@ else()
   # SYSBuild dedicated configuration file.
 endif()
 
-if(DEFINED SB_CONF_FILE AND NOT IS_ABSOLUTE SB_CONF_FILE)
-  cmake_path(ABSOLUTE_PATH SB_CONF_FILE BASE_DIRECTORY ${APP_DIR})
-endif()
-
-if(DEFINED SB_OVERLAY_CONFIG AND NOT IS_ABSOLUTE SB_OVERLAY_CONFIG)
-  cmake_path(ABSOLUTE_PATH SB_OVERLAY_CONFIG BASE_DIRECTORY ${APP_DIR})
-endif()
-
-if(DEFINED SB_EXTRA_CONF_FILE AND NOT IS_ABSOLUTE SB_EXTRA_CONF_FILE)
-  cmake_path(ABSOLUTE_PATH SB_EXTRA_CONF_FILE BASE_DIRECTORY ${APP_DIR})
-endif()
-
 if(NOT DEFINED SB_EXTRA_CONF_FILE AND DEFINED SB_OVERLAY_CONFIG)
   set(SB_EXTRA_CONF_FILE ${SB_OVERLAY_CONFIG})
 endif()
 
+# Let SB_CONF_FILE and SB_EXTRA_CONF_FILE be relative to APP_DIR.
+# Either variable can be a list of paths, so we must make all of them absolute.
+foreach(conf_file_var SB_CONF_FILE SB_EXTRA_CONF_FILE)
+  if(DEFINED ${conf_file_var})
+    string(CONFIGURE "${${conf_file_var}}" conf_file_expanded)
+    set(${conf_file_var} "")
+    foreach(conf_file ${conf_file_expanded})
+      cmake_path(ABSOLUTE_PATH conf_file BASE_DIRECTORY ${APP_DIR})
+      list(APPEND ${conf_file_var} ${conf_file})
+    endforeach()
+  endif()
+endforeach()
+
 if(DEFINED SB_CONF_FILE AND NOT DEFINED CACHE{SB_CONF_FILE})
   # We only want to set this in cache it has been defined and is not already there.
   set(SB_CONF_FILE ${SB_CONF_FILE} CACHE STRING "If desired, you can build the application with \