From 21651d5f0d19731ba4745cff86801609290ec852 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 27 Dec 2024 08:13:58 +0000 Subject: [PATCH] sysbuild: cmake: modules: kconfig: Fix changed CMake API Fixes a bug which was caused by the CMake function API having changed in commit 4e29a35b22d9370de1cc3d885f176c4ea6e7d4d8 (cherry picked from commit aed59d44315cd684422c6c3cb42367e71f3c9dd7) Original-Signed-off-by: Jamie McCrae GitOrigin-RevId: aed59d44315cd684422c6c3cb42367e71f3c9dd7 Cr-Build-Id: 8727404601633048497 Cr-Build-Url: https://cr-buildbucket.appspot.com/build/8727404601633048497 Copybot-Job-Name: zephyr-main-copybot-downstream Change-Id: If239c15b0be6562fce2935deca0ea9768ee3fa0f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/6126625 Bot-Commit: ChromeOS Prod (Robot) Commit-Queue: ChromeOS Prod (Robot) Tested-by: ChromeOS Prod (Robot) --- share/sysbuild/cmake/modules/sysbuild_kconfig.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake b/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake index 00a2a58d2e4..f366c66dbde 100644 --- a/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake +++ b/share/sysbuild/cmake/modules/sysbuild_kconfig.cmake @@ -107,8 +107,9 @@ if(EXISTS ${APP_DIR}/Kconfig.sysbuild) endif() # Apply any EXTRA_CONF_FILE variables from snippets -if(TARGET snippets_scope) - get_property(snippets_EXTRA_CONF_FILE TARGET snippets_scope PROPERTY SB_EXTRA_CONF_FILE) +zephyr_scope_exists(scope_defined snippets) +if(scope_defined) + zephyr_get_scoped(snippets_EXTRA_CONF_FILE snippets SB_EXTRA_CONF_FILE) list(APPEND EXTRA_CONF_FILE ${snippets_EXTRA_CONF_FILE}) endif()