From 87f50bb72b6baff7b73fda132304d46338dda5cc Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Fri, 5 May 2023 08:57:57 +0100 Subject: [PATCH] cmake: extensions: Do not clear variable in zephyr_get MERGE mode Fixes a regression whereby the variable would be cleared prior to being used in MERGE mode. Signed-off-by: Jamie McCrae --- cmake/modules/extensions.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake index 31ffa773896..d2dcd75f6ad 100644 --- a/cmake/modules/extensions.cmake +++ b/cmake/modules/extensions.cmake @@ -2508,7 +2508,9 @@ function(zephyr_get variable) endif() if(GET_VAR_MERGE) - # Clear variable before appending items in MERGE mode + # Clear variable before appending items in MERGE mode but keep a backup for + # local appending later + set(local_var_backup ${${variable}}) set(${variable}) endif() @@ -2574,6 +2576,7 @@ function(zephyr_get variable) endif() if(GET_VAR_MERGE) + list(APPEND ${variable} ${local_var_backup}) list(REMOVE_DUPLICATES ${variable}) set(${variable} ${${variable}} PARENT_SCOPE) endif()