From 26d2f16fafb14235ca7d062bc4471d8b5e0dec54 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Tue, 23 Oct 2018 15:26:33 +0200
Subject: Migrate app-templates to CMake module

Bug-AGL SPEC-1682

Change-Id: I22a946da7f379b71612cc419e8915921bc0bf858
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 binding/CMakeLists.txt    |  5 -----
 conf.d/app-templates      |  1 -
 conf.d/cmake/config.cmake | 14 +++++++++-----
 3 files changed, 9 insertions(+), 11 deletions(-)
 delete mode 160000 conf.d/app-templates

diff --git a/binding/CMakeLists.txt b/binding/CMakeLists.txt
index bdd5d5b..0d05d90 100644
--- a/binding/CMakeLists.txt
+++ b/binding/CMakeLists.txt
@@ -26,14 +26,9 @@ PROJECT_TARGET_ADD(afm-weather-binding)
 	# Binder exposes a unique public entry point
 	SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
 		LABELS "BINDING"
-		LINK_FLAGS ${BINDINGS_LINK_FLAG}
 		OUTPUT_NAME ${TARGET_NAME}
 	)
 
 	# Library dependencies (include updates automatically)
 	TARGET_LINK_LIBRARIES(${TARGET_NAME} ${link_libraries})
 
-	# installation directory
-	INSTALL(TARGETS ${TARGET_NAME}
-		LIBRARY DESTINATION ${BINDINGS_INSTALL_DIR})
-
diff --git a/conf.d/app-templates b/conf.d/app-templates
deleted file mode 160000
index 8967162..0000000
--- a/conf.d/app-templates
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8967162dd12bce89f9ae27f5c9bce7b78624e3fd
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 3b70742..792b9ae 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 "weather")
 
-# 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.
@@ -42,7 +43,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
 
 # Compilation Mode (DEBUG, RELEASE)
 # ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG")
+set(BUILD_TYPE "RELEASE")
 
 # Kernel selection if needed. You can choose between a
 # mandatory version to impose a minimal version.
@@ -79,7 +80,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)
 
@@ -148,5 +149,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 1.2.3-korg