patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

sysbuild: cmake: fix sysbuild_cache_set() function

Browse source 
The sysbuild_cache_set() supports setting variables in a dedicated
sysbuild image cache. When appending to a list, the list is checked for
existance of the variable to avoid appending it again on reruns.

This was done be checking with `string(FIND ...)`, but that will also
return an index on a partial match.

A much safer approach is to use the `if(<val> IN_LIST <list>)` approach
to check for existance.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2024-04-11 12:22:13 +02:00 committed by Carles Cufí
parent 7fb75780df
commit de53c0d2db
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
share/sysbuild/cmake/modules/sysbuild_extensions.cmake
View file

@ -615,9 +615,7 @@ function(sysbuild_cache_set)
# Search for these exact items in the existing value and prevent adding
# them if they are already present which avoids issues with double addition
# when cmake is reran.
string(FIND "$CACHE{${VARS_VAR}}" "${VARS_UNPARSED_ARGUMENTS}" index)
if(NOT ${index} EQUAL -1)
if("${VARS_UNPARSED_ARGUMENTS}" IN_LIST var_new)
return()
endif()