aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-23 16:06:04 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:54:46 +0100
commit3f471062799c92a5f3291ee25f425dd89948d544 (patch)
treea4ca8698d94a592a6d2d4bea9a49fe318f6a729f
parent9952495a83a402a45bfad31dbace0b81d31c299f (diff)
Migrate app-templates to CMake module
Bug-AGL SPEC-1682 Change-Id: Ie906bd571d2936b73fac6b2379cb05f532bea04c Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake20
2 files changed, 12 insertions, 8 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates
deleted file mode 160000
-Subproject 80d95bb8518874a4d510951c905491835bdf831
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 6e2aa26..3d8a53d 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -28,10 +28,11 @@ set(PROJECT_AUTHOR "José Bollo")
set(PROJECT_AUTHOR_MAIL "jose.bollo@iot.bzh")
set(PROJECT_LICENSE "APL2.0")
set(PROJECT_LANGUAGES,"C")
+set(API_NAME "identity")
-# 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.
@@ -75,7 +76,7 @@ set (PKG_REQUIRED_LIST
# Prefix path where will be installed the files
# Default: /usr/local (need root permission to write in)
# ------------------------------------------------------
-#set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+#set(INSTALL_PREFIX $ENV{HOME}/opt)
# Customize link option
# -----------------------------
@@ -110,14 +111,14 @@ set (PKG_REQUIRED_LIST
# CACHE STRING "Compilation flags for PROFILING build type.")
#set(DEBUG_COMPILE_OPTIONS
# -g
+# -O0
# -ggdb
-# -Wp,-U_FORTIFY_SOURCE
# CACHE STRING "Compilation flags for DEBUG build type.")
-#set(CCOV_COMPILE_OPTIONS
+#set(COVERAGE_COMPILE_OPTIONS
# -g
-# -O2
+# -O0
# --coverage
-# CACHE STRING "Compilation flags for CCOV build type.")
+# CACHE STRING "Compilation flags for COVERAGE build type.")
#set(RELEASE_COMPILE_OPTIONS
# -g
# -O2
@@ -197,5 +198,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)