commit ea49cd0b1a62a7bb41b9d0fb87e905b291113196
author Sebastian Bøe <sebastian.boe@nordicsemi.no> Wed Apr 03 15:14:37 2019 +0200
committer David Brown <davidb@davidb.org> Wed Apr 03 19:12:25 2019 -0600
tree c5bbb306a3956828d518815fa3662a415f4f0247
parent fda937ab02296f6fd8e7195e2846d631f3d70559

cmake: Fix bug where dts.overlay was not being appended

Fix bug #399 where dts.overlay was not being appended.

The build scripts were erroneously modifying the shadowed non-cache
variable instead of the cache variable.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>

boot/zephyr/CMakeLists.txt

diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt
index fa7b03b..cb4feca 100644
--- a/boot/zephyr/CMakeLists.txt
+++ b/boot/zephyr/CMakeLists.txt
@@ -16,14 +16,18 @@
 # the list).
 if(DTC_OVERLAY_FILE)
   set(DTC_OVERLAY_FILE
-      "${DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/dts.overlay")
+    "${DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/dts.overlay"
+    CACHE STRING "" FORCE
+    )
 else()
   set(DTC_OVERLAY_FILE ${CMAKE_CURRENT_LIST_DIR}/dts.overlay)
 endif()
 
 if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}.overlay)
   set(DTC_OVERLAY_FILE
-      "${DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}.overlay")
+    "${DTC_OVERLAY_FILE} ${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}.overlay"
+    CACHE STRING "" FORCE
+    )
 endif()
 
 # Enable Zephyr runner options which request mass erase if so