Browse Source

cmake: Fix support for "ninja flash"

By default west looks at the parents directory to find Zephyr base
directory. However, in the case the build directory is not a subdirectory
of zephyr base and the user run "ninja flash" directly from the build
directory, west fails to detect Zephyr base.

So, this patch explicitly add ZEPHYR_BASE in the environment.

Implementation notes:
  * ZEPHYR_BASE is already set for ninja menuconfig in
    cmake/modules/kconfig.cmake:201
  * ZEPHYR_BASE seems better than --zephyr-base since the environment in
    inherited
  * BTW, --zephyr-base seems to not have any impact and seems broken

Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
pull/92370/merge
Jérôme Pouiller 2 weeks ago committed by Dan Kalowsky
parent
commit
e7fdc84696
  1. 2
      cmake/flash/CMakeLists.txt

2
cmake/flash/CMakeLists.txt

@ -196,7 +196,7 @@ foreach(target flash debug debugserver attach rtt) @@ -196,7 +196,7 @@ foreach(target flash debug debugserver attach rtt)
-DDEPENDENCIES="$<TARGET_PROPERTY:${target},MANUALLY_ADDED_DEPENDENCIES>"
-P ${CMAKE_CURRENT_LIST_DIR}/check_runner_dependencies.cmake
COMMAND
${CMAKE_COMMAND} -E env
${CMAKE_COMMAND} -E env ZEPHYR_BASE=${ZEPHYR_BASE}
${WEST}
${RUNNER_VERBOSE}
${target}

Loading…
Cancel
Save