Migrate app-templates to CMake module

Bug-AGL SPEC-1682

Change-Id: I040a1bbd51e4920ffd24f9b0db6611a1513d89e7
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a909234..da558a5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,10 +20,3 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/config.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake)
-
-# Bindings to compile
-# --------------------
-project_subdirs_add()
-
-project_closing_msg()

diff --git a/conf.d/app-templates b/conf.d/app-templates
deleted file mode 160000 (submodule)
index 7315692..0000000
--- a/conf.d/app-templates
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 731569245162803678efed3a6940a9490033eceb

diff --git a/conf.d/config.cmake b/conf.d/config.cmake
index 1f50917..bb007f9 100644 (file)
--- a/conf.d/config.cmake
+++ b/conf.d/config.cmake
@@ -30,9 +30,9 @@ set(PROJECT_ICON "icon.png")
 set(PROJECT_LICENCE "APL2.0")
 set(PROJECT_LANGUAGES,"C")
 
-# 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.
@@ -74,7 +74,7 @@ set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
 
 # Optional location for config.xml.in
 # -----------------------------------
-set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in)
+#set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in)
 
 # Mandatory widget Mimetype specification
 # --------------------------------------------------
@@ -84,7 +84,7 @@ set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in)
 # - application/x-executable
 # - text/html
 #
-#set(WIDGET_TYPE None)
+set(WIDGET_TYPE application/x-executable)
 
 # Mandatory Widget entry point file.
 # ----------------------------------------------------
@@ -126,3 +126,11 @@ set(WIDGET_CONFIG_TEMPLATE ${CMAKE_CURRENT_SOURCE_DIR}/conf.d/wgt/config.xml.in)
 #------------------------------------------------------------
 #set(AFB_TOKEN   ""      CACHE PATH "Default AFB_TOKEN")
 #set(AFB_REMPORT "1234" CACHE PATH "Default AFB_TOKEN")
+
+# 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(CMakeAfbTemplates)