summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:45:15 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:53:05 +0100
commit760e96b8618a8cbf62ba3b3caf231c0720c1c616 (patch)
tree0aab1cb4349084e30a2623c967f0d945fbbffee0
parent2a4dcc1cbb84a8e39461eaa871e268d2460dad74 (diff)
Migrate app-templates to CMake module
Bug-AGL SPEC-1682 Change-Id: Id8ecc71afed1e9383a15f595a8eaf78d5e3d2b0b 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, 8 insertions, 4 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates
deleted file mode 160000
-Subproject 7ba30135732fc49bfadd5866c08be7080c9f393
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index cc8bcb3..69082be 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -27,10 +27,11 @@ set(PROJECT_AUTHOR "Collignon, Loïc")
set(PROJECT_AUTHOR_MAIL "loic.collignon@iot.bzh")
set(PROJECT_LICENCE "APL2.0")
set(PROJECT_LANGUAGES,"C")
+set(API_NAME ahl-4a)
-# 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")
# Use any directory that does not start with _ as valid source rep
set(PROJECT_SRC_DIR_PATTERN "[^_]*")
@@ -38,7 +39,7 @@ set(PROJECT_SRC_DIR_PATTERN "[^_]*")
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
# Set a default build type if none was specified
-set(BUILD_TYPE "Debug")
+set(BUILD_TYPE "RELEASE")
# Alsa does not really like libEfence
set(USE_EFENCE 0)
@@ -163,5 +164,8 @@ set(WIDGET_TYPE application/vnd.agl.service)
# 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)