summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:40:59 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:55:07 +0100
commitd43fa62bda4912580c1b790bdc4172e862aba975 (patch)
tree5c3ce6b125d9f88edb94b985b7c750a26377e27e
parent1b3655d85cfb9cc143c9e7f0d3506e6b004f835e (diff)
Migrate app-templates to CMake module
Bug-AGL SPEC-1682 Change-Id: I9f8e4f8bb2c7a020e41215022d2528ea9c26afe1 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake11
2 files changed, 7 insertions, 4 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates
deleted file mode 160000
-Subproject 0f25ab2fa35a36c8d9b4675522f1ecb9ec74d88
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 3fbc3ef6..550409a9 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -29,16 +29,16 @@ set(PROJECT_LICENSE "APL2.0")
set(PROJECT_LANGUAGES "C;CXX")
set(API_NAME "low-can")
-# 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")
# Which directories inspect to find CMakeLists.txt target files
# set(PROJECT_SRC_DIR_PATTERN "*")
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG" CACHE STRING "Default Build variant chosen. (Overwritten by cli if given)")
+set(BUILD_TYPE "RELEASE" CACHE STRING "Default Build variant chosen. (Overwritten by cli if given)")
# Kernel selection if needed. You can choose between a
# mandatory version to impose a minimal version.
@@ -190,5 +190,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)