From d38da9d38627c7dab6cf97b590f8cc866217d8bc Mon Sep 17 00:00:00 2001 From: Torsten Rasmussen Date: Tue, 30 Jun 2020 09:55:54 +0200 Subject: [PATCH] cmake: runners dependencies cleanup This commit renames `FLASH_DEPS` to `RUNNERS_DEPS`. The current name `FLASH_DEPS` is misleading in the sense that this depency is added to all runner targets, flash, debug, debugserver, attach, and not only the flash runners. Therefore this is now named `RUNNERS_DEPS` instead. Similar, zephyr_property_target now contains the property FLASH_DEPENDENCIES, DEBUG_DEPENDENCIES, and so on, so that additional dependencies can be added for each runner. Signed-off-by: Torsten Rasmussen --- CMakeLists.txt | 2 +- cmake/flash/CMakeLists.txt | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7709cbcfc53..8f4d0786772 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1344,7 +1344,7 @@ if(HEX_FILES_TO_MERGE) ) add_custom_target(mergehex ALL DEPENDS ${MERGED_HEX_NAME}) - list(APPEND FLASH_DEPS mergehex) + list(APPEND RUNNERS_DEPS mergehex) message(VERBOSE "Merging hex files: ${HEX_FILES_TO_MERGE}") endif() diff --git a/cmake/flash/CMakeLists.txt b/cmake/flash/CMakeLists.txt index cec49f0ec69..aaa06419aa6 100644 --- a/cmake/flash/CMakeLists.txt +++ b/cmake/flash/CMakeLists.txt @@ -179,8 +179,9 @@ foreach(target flash debug debugserver attach) elseif(target STREQUAL attach) set(comment "Debugging ${BOARD}") endif() + string(TOUPPER ${target} TARGET_UPPER) - list(APPEND FLASH_DEPS ${logical_target_for_zephyr_elf}) + list(APPEND RUNNERS_DEPS ${logical_target_for_zephyr_elf}) # Enable verbose output, if requested. if(CMAKE_VERBOSE_MAKEFILE) @@ -198,8 +199,8 @@ foreach(target flash debug debugserver attach) ${RUNNER_VERBOSE} ${target} --skip-rebuild - DEPENDS ${FLASH_DEPS} - $ + DEPENDS ${RUNNERS_DEPS} + $ WORKING_DIRECTORY ${APPLICATION_BINARY_DIR} )