michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: runners dependencies cleanup

Browse source 
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 <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2020-06-30 09:55:54 +02:00 • committed by Anas Nashif
commit d38da9d386
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1344,7 +1344,7 @@ if(HEX_FILES_TO_MERGE)
) )
add_custom_target(mergehex ALL DEPENDS ${MERGED_HEX_NAME}) 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}") message(VERBOSE "Merging hex files: ${HEX_FILES_TO_MERGE}")
endif() endif()

7
cmake/flash/CMakeLists.txt
View file

@ -179,8 +179,9 @@ foreach(target flash debug debugserver attach)
elseif(target STREQUAL attach) elseif(target STREQUAL attach)
set(comment "Debugging ${BOARD}") set(comment "Debugging ${BOARD}")
endif() 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. # Enable verbose output, if requested.
if(CMAKE_VERBOSE_MAKEFILE) if(CMAKE_VERBOSE_MAKEFILE)
@ -198,8 +199,8 @@ foreach(target flash debug debugserver attach)
${RUNNER_VERBOSE} ${RUNNER_VERBOSE}
${target} ${target}
--skip-rebuild --skip-rebuild
DEPENDS ${FLASH_DEPS} DEPENDS ${RUNNERS_DEPS}
$<TARGET_PROPERTY:zephyr_property_target,FLASH_DEPENDENCIES> $<TARGET_PROPERTY:zephyr_property_target,${TARGET_UPPER}_DEPENDENCIES>
WORKING_DIRECTORY ${APPLICATION_BINARY_DIR} WORKING_DIRECTORY ${APPLICATION_BINARY_DIR}
) )