From 48321ef2525c14c4d9b6040afe8ae72ff07a8d1e Mon Sep 17 00:00:00 2001 From: Torsten Rasmussen Date: Mon, 15 Feb 2021 09:29:43 +0100 Subject: [PATCH] shield: cmake: adjust if(EXISTS .conf) to check for right file Fixes: #32269 This commit is a followup to #31877 where the `${shield_dir}/${s_dir}` was adjusted to `${SHIELD_DIR_${s}}` to ensure only including shields and not boards in list of known shields. An `if(EXISTS ${shield_dir}/${s_dir}...)` was missed in this process which causes #32269. This is corrected in this commit. Signed-off-by: Torsten Rasmussen --- cmake/app/boilerplate.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/app/boilerplate.cmake b/cmake/app/boilerplate.cmake index 04b564190bd..599f09f1533 100644 --- a/cmake/app/boilerplate.cmake +++ b/cmake/app/boilerplate.cmake @@ -349,7 +349,7 @@ foreach(root ${BOARD_ROOT}) ) # search for shield/shield.conf file - if(EXISTS ${shield_dir}/${s_dir}/${s}.conf) + if(EXISTS ${SHIELD_DIR_${s}}/${s}.conf) # add shield.conf to the shield config list list(APPEND shield_conf_files