diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-05-17 16:54:17 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-05-17 16:54:17 +0200 |
| commit | 7df33dd8a243a953d31d442279ea51486a156eac (patch) | |
| tree | a11b62ac636d61046ef8ca0794f13bd10a839252 | |
| parent | a047b521311918056979eaa6ac8a03416ba3d137 (diff) | |
GLOBAL property instead of cache var to handle project targets
Didn't find the property GlobalTargetList even in cmake 3.8. So using the existing
variable.
Change-Id: I2851d54d11daf2462321e234c577fde911d078ee
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | reference/etc/macros.cmake | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/reference/etc/macros.cmake b/reference/etc/macros.cmake index e2ed2f0..2d04d34 100644 --- a/reference/etc/macros.cmake +++ b/reference/etc/macros.cmake @@ -28,16 +28,8 @@ # Generic useful macro # ----------------------- macro(PROJECT_TARGET_ADD TARGET_NAME) - set(PROJECT_TARGETS ${PROJECT_TARGETS} ${TARGET_NAME} CACHE INTERNAL PROJECT_TARGETS) + set_property(GLOBAL APPEND PROPERTY PROJECT_TARGETS ${TARGET_NAME}) set(TARGET_NAME ${TARGET_NAME}) - - # Cmake does not maintain targets list before 3.7 - # ------------------------------------------------- - if(${CMAKE_VERSION} VERSION_LESS 3.7) - set(GLOBAL_TARGET_LIST ${PROJECT_TARGETS} CACHE INTERNAL "Hold project targets") - else() - get_property(GLOBAL_TARGET_LIST GLOBAL PROPERTY GlobalTargetList) - endif() endmacro(PROJECT_TARGET_ADD) # Check GCC minimal version version @@ -258,11 +250,11 @@ endif() # Print developer helper message when build is done # ------------------------------------------------------- macro(project_closing_msg) - if(CLOSING_MESSAGE AND GLOBAL_TARGET_LIST) + if(CLOSING_MESSAGE AND PROJECT_TARGETS) add_custom_target(${PROJECT_NAME}_build_done ALL COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}" ) add_dependencies(${PROJECT_NAME}_build_done - ${DEPENDENCIES_TARGET} ${GLOBAL_TARGET_LIST}) + ${DEPENDENCIES_TARGET} ${PROJECT_TARGETS}) endif() endmacro() |