commit f0e5a842b35c52c4ad1aac3fa89b1450f4dd07b0
author Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no> Wed Jan 22 09:55:19 2020 +0000
committer David Brown <davidb@davidb.org> Wed Jan 22 10:09:57 2020 -0700
tree af96484d410ae3321bce2ade7048de4453367639
parent e96b6873bd8a64185796ac47b941f56dd29b6e3f

cmake: use zephyr base in relative path

To be more robust in the placement of MCUBoot directory,
use the ZEPHYR_BASE env variable to locate
nrfxlib directory.

Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>

boot/zephyr/CMakeLists.txt

diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt
index 5f21aea..7906a24 100644
--- a/boot/zephyr/CMakeLists.txt
+++ b/boot/zephyr/CMakeLists.txt
@@ -60,7 +60,7 @@
 set(NRF_DIR "${MCUBOOT_DIR}/ext/nrf")
 
 if(CONFIG_BOOT_USE_NRF_CC310_BL)
-set(NRFXLIB_DIR ${MCUBOOT_DIR}/../nrfxlib)
+set(NRFXLIB_DIR $ENV{ZEPHYR_BASE}/../nrfxlib)
 assert_exists(NRFXLIB_DIR)
 # Don't include this if we are using west
  add_subdirectory(${NRFXLIB_DIR} ${PROJECT_BINARY_DIR}/nrfxlib)