From 3d01a83c2e405e9435a4f150e5a6e8210ce9ad52 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Tue, 23 Oct 2018 16:04:40 +0200
Subject: Migrate app-templates to CMake module
Bug-AGL SPEC-1682
Change-Id: I1445d2b8ddbdcbf70bb994e912fd315e0323b1d2
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
conf.d/app-templates | 1 -
conf.d/cmake/config.cmake | 12 ++++++++----
2 files changed, 8 insertions(+), 5 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 0f25ab2..0000000
--- a/conf.d/app-templates
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0f25ab2fa35a36c8d9b4675522f1ecb9ec74d884
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index ab14372..2dca7ca 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -25,10 +25,11 @@ set(PROJECT_VERSION "1.0")
set(PROJECT_ICON "icon.png")
set(PROJECT_LICENSE "APL2.0")
set(PROJECT_LANGUAGES,"C")
+set(API_NAME "gps")
-# 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.
@@ -77,7 +78,7 @@ list (APPEND link_libraries -pthread)
# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
# ---------------------------------------------------------------------
-set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+set(INSTALL_PREFIX $ENV{HOME}/opt)
set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
@@ -146,5 +147,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