diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-05-17 17:42:07 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2018-10-15 18:22:20 +0200 |
| commit | c518e8e03f85fb674625c7076c633936fff31c5e (patch) | |
| tree | 1f33a3f77907e8c56b9e057b87cd3b6764408df0 | |
| parent | 946c5f18b1e1de50638dee6895df66023f804992 (diff) | |
Update templates
Change-Id: Iff329f333f3b6f81471a6c5ada5acb0418523f21
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | templates/html5/etc/macros.cmake | 5 | ||||
| -rw-r--r-- | templates/hybrid-html5/etc/macros.cmake | 5 | ||||
| -rw-r--r-- | templates/native/etc/macros.cmake | 5 | ||||
| -rw-r--r-- | templates/service/etc/macros.cmake | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/templates/html5/etc/macros.cmake b/templates/html5/etc/macros.cmake index 98ea3b5..5514679 100644 --- a/templates/html5/etc/macros.cmake +++ b/templates/html5/etc/macros.cmake @@ -30,7 +30,7 @@ macro(PROJECT_TARGET_ADD TARGET_NAME) set_property(GLOBAL APPEND PROPERTY PROJECT_TARGETS ${TARGET_NAME}) set(TARGET_NAME ${TARGET_NAME}) -endmacro() +endmacro(PROJECT_TARGET_ADD) # Check GCC minimal version version if (gcc_minimal_version) @@ -250,7 +250,8 @@ endif() # Print developer helper message when build is done # ------------------------------------------------------- macro(project_closing_msg) - if(CLOSING_MESSAGE AND PROJECT_TARGETS) + get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS) + if(CLOSING_MESSAGE AND ${PROJECT_TARGETS}) add_custom_target(${PROJECT_NAME}_build_done ALL COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}" ) diff --git a/templates/hybrid-html5/etc/macros.cmake b/templates/hybrid-html5/etc/macros.cmake index 98ea3b5..5514679 100644 --- a/templates/hybrid-html5/etc/macros.cmake +++ b/templates/hybrid-html5/etc/macros.cmake @@ -30,7 +30,7 @@ macro(PROJECT_TARGET_ADD TARGET_NAME) set_property(GLOBAL APPEND PROPERTY PROJECT_TARGETS ${TARGET_NAME}) set(TARGET_NAME ${TARGET_NAME}) -endmacro() +endmacro(PROJECT_TARGET_ADD) # Check GCC minimal version version if (gcc_minimal_version) @@ -250,7 +250,8 @@ endif() # Print developer helper message when build is done # ------------------------------------------------------- macro(project_closing_msg) - if(CLOSING_MESSAGE AND PROJECT_TARGETS) + get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS) + if(CLOSING_MESSAGE AND ${PROJECT_TARGETS}) add_custom_target(${PROJECT_NAME}_build_done ALL COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}" ) diff --git a/templates/native/etc/macros.cmake b/templates/native/etc/macros.cmake index 98ea3b5..5514679 100644 --- a/templates/native/etc/macros.cmake +++ b/templates/native/etc/macros.cmake @@ -30,7 +30,7 @@ macro(PROJECT_TARGET_ADD TARGET_NAME) set_property(GLOBAL APPEND PROPERTY PROJECT_TARGETS ${TARGET_NAME}) set(TARGET_NAME ${TARGET_NAME}) -endmacro() +endmacro(PROJECT_TARGET_ADD) # Check GCC minimal version version if (gcc_minimal_version) @@ -250,7 +250,8 @@ endif() # Print developer helper message when build is done # ------------------------------------------------------- macro(project_closing_msg) - if(CLOSING_MESSAGE AND PROJECT_TARGETS) + get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS) + if(CLOSING_MESSAGE AND ${PROJECT_TARGETS}) add_custom_target(${PROJECT_NAME}_build_done ALL COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}" ) diff --git a/templates/service/etc/macros.cmake b/templates/service/etc/macros.cmake index 98ea3b5..5514679 100644 --- a/templates/service/etc/macros.cmake +++ b/templates/service/etc/macros.cmake @@ -30,7 +30,7 @@ macro(PROJECT_TARGET_ADD TARGET_NAME) set_property(GLOBAL APPEND PROPERTY PROJECT_TARGETS ${TARGET_NAME}) set(TARGET_NAME ${TARGET_NAME}) -endmacro() +endmacro(PROJECT_TARGET_ADD) # Check GCC minimal version version if (gcc_minimal_version) @@ -250,7 +250,8 @@ endif() # Print developer helper message when build is done # ------------------------------------------------------- macro(project_closing_msg) - if(CLOSING_MESSAGE AND PROJECT_TARGETS) + get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS) + if(CLOSING_MESSAGE AND ${PROJECT_TARGETS}) add_custom_target(${PROJECT_NAME}_build_done ALL COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}" ) |