From 63ffbac48be3a055186c66cfcaeee6247c7f3a05 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 23 Oct 2018 15:26:33 +0200 Subject: Migrate app-templates to CMake module Bug-AGL SPEC-1682 Change-Id: Icb299d7f824683b454731a47ca928184abf494b1 Signed-off-by: Romain Forlot --- conf.d/app-templates | 1 - conf.d/cmake/config.cmake | 9 ++++++--- 2 files changed, 6 insertions(+), 4 deletions(-) delete mode 160000 conf.d/app-templates diff --git a/conf.d/app-templates b/conf.d/app-templates deleted file mode 160000 index 3dc85ec..0000000 --- a/conf.d/app-templates +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3dc85ecc9693a3a4af6d1143507f56b6800d523e 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) -- cgit 1.2.3-korg