From 6993026755563379e964966ee7fc73923a21828d Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Wed, 17 May 2017 18:43:49 +0200
Subject: Update template to the reference
Change-Id: I32b9911fa0f8b294e3f38ce88de2ed58a9b57c71
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
templates/html5/etc/config.cmake | 2 +-
templates/html5/etc/macros.cmake | 4 +++-
templates/hybrid-html5/etc/config.cmake | 2 +-
templates/hybrid-html5/etc/macros.cmake | 4 +++-
templates/native/etc/config.cmake | 2 +-
templates/native/etc/macros.cmake | 4 +++-
templates/service/etc/config.cmake | 2 +-
templates/service/etc/macros.cmake | 4 +++-
8 files changed, 16 insertions(+), 8 deletions(-)
(limited to 'templates')
diff --git a/templates/html5/etc/config.cmake b/templates/html5/etc/config.cmake
index a9bb0a7..a6035fa 100644
--- a/templates/html5/etc/config.cmake
+++ b/templates/html5/etc/config.cmake
@@ -18,7 +18,7 @@
# Project Info
# ------------------
-set(NAME HTML5-example)
+set(PROJECT_NAME HTML5-example)
set(VERSION "0.0")
set(PROJECT_PRETTY_NAME "HTML5 Example")
set(PROJECT_DESCRIPTION "HTML5 AGL application example")
diff --git a/templates/html5/etc/macros.cmake b/templates/html5/etc/macros.cmake
index 5514679..18af27e 100644
--- a/templates/html5/etc/macros.cmake
+++ b/templates/html5/etc/macros.cmake
@@ -47,6 +47,7 @@ endmacro(defstr)
# WGT packaging
macro(project_targets_populate)
add_custom_target(MAIN_POPULATE)
+ get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
foreach(TARGET ${PROJECT_TARGETS})
get_target_property(T ${TARGET} LABELS)
if(T)
@@ -250,8 +251,9 @@ endif()
# Print developer helper message when build is done
# -------------------------------------------------------
macro(project_closing_msg)
+ get_property(PROJECT_TARGETS_SET GLOBAL PROPERTY PROJECT_TARGETS SET)
get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
- if(CLOSING_MESSAGE AND ${PROJECT_TARGETS})
+ if(CLOSING_MESSAGE AND ${PROJECT_TARGETS_SET})
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/config.cmake b/templates/hybrid-html5/etc/config.cmake
index b7c9a91..c3baad5 100644
--- a/templates/hybrid-html5/etc/config.cmake
+++ b/templates/hybrid-html5/etc/config.cmake
@@ -18,7 +18,7 @@
# Project Info
# ------------------
-set(NAME Hybrid-HTML5-example)
+set(PROJECT_NAME Hybrid-HTML5-example)
set(VERSION "0.0")
set(PROJECT_PRETTY_NAME "Hybrid HTML5 Example")
set(PROJECT_DESCRIPTION "Hybrid HTML5 AGL application example")
diff --git a/templates/hybrid-html5/etc/macros.cmake b/templates/hybrid-html5/etc/macros.cmake
index 5514679..18af27e 100644
--- a/templates/hybrid-html5/etc/macros.cmake
+++ b/templates/hybrid-html5/etc/macros.cmake
@@ -47,6 +47,7 @@ endmacro(defstr)
# WGT packaging
macro(project_targets_populate)
add_custom_target(MAIN_POPULATE)
+ get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
foreach(TARGET ${PROJECT_TARGETS})
get_target_property(T ${TARGET} LABELS)
if(T)
@@ -250,8 +251,9 @@ endif()
# Print developer helper message when build is done
# -------------------------------------------------------
macro(project_closing_msg)
+ get_property(PROJECT_TARGETS_SET GLOBAL PROPERTY PROJECT_TARGETS SET)
get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
- if(CLOSING_MESSAGE AND ${PROJECT_TARGETS})
+ if(CLOSING_MESSAGE AND ${PROJECT_TARGETS_SET})
add_custom_target(${PROJECT_NAME}_build_done ALL
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}"
)
diff --git a/templates/native/etc/config.cmake b/templates/native/etc/config.cmake
index 1c8607e..4e9ac5c 100644
--- a/templates/native/etc/config.cmake
+++ b/templates/native/etc/config.cmake
@@ -18,7 +18,7 @@
# Project Info
# ------------------
-set(NAME native-example)
+set(PROJECT_NAME native-example)
set(VERSION "0.0")
set(PROJECT_PRETTY_NAME "Native Example")
set(PROJECT_DESCRIPTION "Native AGL application example")
diff --git a/templates/native/etc/macros.cmake b/templates/native/etc/macros.cmake
index 5514679..18af27e 100644
--- a/templates/native/etc/macros.cmake
+++ b/templates/native/etc/macros.cmake
@@ -47,6 +47,7 @@ endmacro(defstr)
# WGT packaging
macro(project_targets_populate)
add_custom_target(MAIN_POPULATE)
+ get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
foreach(TARGET ${PROJECT_TARGETS})
get_target_property(T ${TARGET} LABELS)
if(T)
@@ -250,8 +251,9 @@ endif()
# Print developer helper message when build is done
# -------------------------------------------------------
macro(project_closing_msg)
+ get_property(PROJECT_TARGETS_SET GLOBAL PROPERTY PROJECT_TARGETS SET)
get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
- if(CLOSING_MESSAGE AND ${PROJECT_TARGETS})
+ if(CLOSING_MESSAGE AND ${PROJECT_TARGETS_SET})
add_custom_target(${PROJECT_NAME}_build_done ALL
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}"
)
diff --git a/templates/service/etc/config.cmake b/templates/service/etc/config.cmake
index 0d8ec9f..e614619 100644
--- a/templates/service/etc/config.cmake
+++ b/templates/service/etc/config.cmake
@@ -18,7 +18,7 @@
# Project Info
# ------------------
-set(NAME service-example)
+set(PROJECT_NAME service-example)
set(VERSION "0.0")
set(PROJECT_PRETTY_NAME "Service binding Example")
set(PROJECT_DESCRIPTION "service binding AGL application example")
diff --git a/templates/service/etc/macros.cmake b/templates/service/etc/macros.cmake
index 5514679..18af27e 100644
--- a/templates/service/etc/macros.cmake
+++ b/templates/service/etc/macros.cmake
@@ -47,6 +47,7 @@ endmacro(defstr)
# WGT packaging
macro(project_targets_populate)
add_custom_target(MAIN_POPULATE)
+ get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
foreach(TARGET ${PROJECT_TARGETS})
get_target_property(T ${TARGET} LABELS)
if(T)
@@ -250,8 +251,9 @@ endif()
# Print developer helper message when build is done
# -------------------------------------------------------
macro(project_closing_msg)
+ get_property(PROJECT_TARGETS_SET GLOBAL PROPERTY PROJECT_TARGETS SET)
get_property(PROJECT_TARGETS GLOBAL PROPERTY PROJECT_TARGETS)
- if(CLOSING_MESSAGE AND ${PROJECT_TARGETS})
+ if(CLOSING_MESSAGE AND ${PROJECT_TARGETS_SET})
add_custom_target(${PROJECT_NAME}_build_done ALL
COMMAND ${CMAKE_COMMAND} -E cmake_echo_color --cyan "++ ${CLOSING_MESSAGE}"
)
--
cgit