Skip to content
Permalink
Browse files

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 <Marcin.Szymczyk@nordicsemi.no>
  • Loading branch information...
masz-nordic authored and galak committed Apr 3, 2019
1 parent a000ba7 commit fa0083ad0eab1234c06ee0a2f3c5863fdd82116b
Showing with 1 addition and 0 deletions.
  1. +1 −0 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)

0 comments on commit fa0083a

Please sign in to comment.
You can’t perform that action at this time.