summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-23 15:26:40 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:55:34 +0100
commit50be4386b5355543b7b6d37c0a9b5bb9cc73590e (patch)
treed9f2dd54a0d3b8140397e5cf7d28468161c02d45
parente2c70866cc7d4a55409fd459b02118c629b4b216 (diff)
Migrate app-templates to CMake module
Bug-AGL SPEC-1682 Change-Id: I7262c9c31ecdf2eb939349eb563311ef970006d2 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake9
2 files changed, 6 insertions, 3 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates
deleted file mode 160000
-Subproject 76e12e76c7065fb3440312af3e54eae9d40c525
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 10d3975..52ab7bb 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -29,9 +29,9 @@ set(PROJECT_AUTHOR_MAIL "jonathan.aillet@iot.bzh")
set(PROJECT_LICENSE "APL2.0")
set(PROJECT_LANGUAGES "C")
-# Where are stored default templates files from submodule or subtree app-templates in your project tree
+# Where are stored the project configuration files
# relative to the root project directory
-set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
+set(PROJECT_CMAKE_CONF_DIR "conf.d")
# Where are stored your external libraries for your project. This is 3rd party library that you don't maintain
# but used and must be built and linked.
@@ -209,5 +209,8 @@ set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install
# This include is mandatory and MUST happens at the end
# of this file, else you expose you to unexpected behavior
+#
+# This CMake module could be found at the following url:
+# https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/cmake-apps-module
# -----------------------------------------------------------
-include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake)
+include(CMakeAfbTemplates)