From a074d52778484878ffa20071fa6cab7e0cef09d6 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 21 Apr 2023 10:02:02 +0100 Subject: [PATCH] sysbuild: Fix missing CACHE prefix for images Fixes an issue whereby the direct variable was being used instead of the cache variable when configuring target images. Signed-off-by: Jamie McCrae --- share/sysbuild/cmake/modules/sysbuild_extensions.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake index d7eb004a17d..eefb52c3f56 100644 --- a/share/sysbuild/cmake/modules/sysbuild_extensions.cmake +++ b/share/sysbuild/cmake/modules/sysbuild_extensions.cmake @@ -298,11 +298,15 @@ function(ExternalZephyrProject_Cmake) get_cmake_property(sysbuild_cache CACHE_VARIABLES) foreach(var_name ${sysbuild_cache}) if(NOT "${var_name}" MATCHES "^CMAKE_.*") + # Perform a dummy read to prevent a false warning about unused variables + # being emitted due to a cmake bug: https://gitlab.kitware.com/cmake/cmake/-/issues/24555 + set(unused_tmp_var ${${var_name}}) + # We don't want to pass internal CMake variables. # Required CMake variable to be passed, like CMAKE_BUILD_TYPE must be # passed using `-D` on command invocation. get_property(var_type CACHE ${var_name} PROPERTY TYPE) - set(cache_entry "${var_name}:${var_type}=${${var_name}}") + set(cache_entry "${var_name}:${var_type}=$CACHE{${var_name}}") string(REPLACE ";" "\;" cache_entry "${cache_entry}") list(APPEND sysbuild_cache_strings "${cache_entry}\n") endif()