summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-23 15:26:31 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:51:08 +0100
commit5f6ce662b8833b56e603c1cf2b57f4feb5491566 (patch)
treee6cfe9f50543b7262b18836a8255807d0594991d
parent44c18422bd8fe7045afa6d61351ef65f27cd7bd5 (diff)
Migrate app-templates to CMake module
Bug-AGL SPEC-1682 Change-Id: I1578d1e71d66813ed45dfac80b2fceee7c012150 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake12
2 files changed, 7 insertions, 5 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 b4f4312..20acacb 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -29,9 +29,9 @@ set(PROJECT_LICENSE "APL2.0")
set(PROJECT_LANGUAGES "CXX")
set(API_NAME "signal-composer")
-# 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.
@@ -45,8 +45,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
-set(BUILD_TYPE "DEBUG")
-
+set(BUILD_TYPE "RELEASE")
# Kernel selection if needed. You can choose between a
# mandatory version to impose a minimal version.
@@ -202,5 +201,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)