summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-23 15:26:33 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:52:29 +0100
commit63ffbac48be3a055186c66cfcaeee6247c7f3a05 (patch)
tree3e608738e595631de23e3d14026bf70cb7c06883
parent2a5df653e3b4704d233fe8d07f2d44fca380c78d (diff)
Migrate app-templates to CMake module
Bug-AGL SPEC-1682 Change-Id: Icb299d7f824683b454731a47ca928184abf494b1 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 3dc85ecc9693a3a4af6d1143507f56b6800d523
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 9556a87..7c82ba1 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -30,9 +30,9 @@ set(PROJECT_LICENSE "MIT")
set(PROJECT_LANGUAGES,"C")
set(API_NAME "persistence")
-# 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.
@@ -197,5 +197,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)