From fa0083ad0eab1234c06ee0a2f3c5863fdd82116b Mon Sep 17 00:00:00 2001 From: Marcin Szymczyk Date: Wed, 3 Apr 2019 11:15:38 +0200 Subject: [PATCH] cmake: fix support for out of tree shields After the rework in #12403, specifying a shield which has overlay out of the tree causes unnecessary inclusions of overlays. For every board root, overlays that have same index as expected overlay are being included. Fix this by removing already included overlays from SHIELD list. Signed-off-by: Marcin Szymczyk --- cmake/app/boilerplate.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/app/boilerplate.cmake b/cmake/app/boilerplate.cmake index 89b0888ea89..53e693e03ff 100644 --- a/cmake/app/boilerplate.cmake +++ b/cmake/app/boilerplate.cmake @@ -291,6 +291,7 @@ foreach(root ${BOARD_ROOT}) if(DEFINED SHIELD) foreach(s ${SHIELD_AS_LIST}) + list(REMOVE_ITEM SHIELD ${s}) list(FIND SHIELD_LIST ${s} _idx) if (NOT _idx EQUAL -1) list(GET shields_refs_list ${_idx} s_path)