summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-08-25 02:04:13 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-15 18:22:47 +0200
commit4a956003ffc9949e319056a64ad3ab3aeb154703 (patch)
tree73ec87e07f8c0d9698b2422caac941a81eaaee2e /cmake
parent02e2193c59b68a1194042aa812ab00b8419301fb (diff)
Generic default CLOSING_MESSAGE in sample config
Change-Id: I6886b4d7844e208f3f996418d9658567e8d8f135 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cmake.d/03-macros.cmake4
-rw-r--r--cmake/cmake.d/04-extra_targets.cmake9
2 files changed, 2 insertions, 11 deletions
diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index 45d1ef5..0bab354 100644
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -495,7 +495,7 @@ macro(project_closing_msg)
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} ${PROJECT_TARGETS})
+ add_dependencies(${PROJECT_NAME}_build_done
+ ${PROJECT_TARGETS} populate)
endif()
endmacro()
diff --git a/cmake/cmake.d/04-extra_targets.cmake b/cmake/cmake.d/04-extra_targets.cmake
index d54e128..4e7921a 100644
--- a/cmake/cmake.d/04-extra_targets.cmake
+++ b/cmake/cmake.d/04-extra_targets.cmake
@@ -24,15 +24,6 @@
# Customise your preferences in "./conf.d/cmake/config.cmake"
#--------------------------------------------------------------------------
-# Add a dummy target to enable global dependency order
-# -----------------------------------------------------
-if(EXTRA_DEPENDENCIES_ORDER)
- set(DEPENDENCIES_TARGET ${PROJECT_NAME}_extra_dependencies)
- add_custom_target(${DEPENDENCIES_TARGET} ALL
- DEPENDS ${EXTRA_DEPENDENCY_ORDER}
- )
-endif()
-
# ----------------------------------------------------------------------------
# Archive target
# ----------------------------------------------------------------------------