Update to the latest app-templates version

No more needs to call any macro and only include
config.cmake file is mandatory. Common.cmake is include
from config.cmake file
Generation autobuild script in conf.d/autobuild dir

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 816932c..b485097 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,13 +19,3 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.3)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/cmake/config.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/conf.d/app-templates/cmake/common.cmake)
-
-# Bindings to compile
-# --------------------
-project_subdirs_add()
-
-project_targets_populate()
-project_package_build()
-
-project_closing_msg()

diff --git a/conf.d/app-templates b/conf.d/app-templates
index 0d3bfaf..393a4f1 160000 (submodule)
--- a/conf.d/app-templates
+++ b/conf.d/app-templates
@@ -1 +1 @@
-Subproject commit 0d3bfaf0888cb350f8721db4a4115ecb8dc4f005
+Subproject commit 393a4f164218c8a92b43f666f4cc4177fd1e3a1d

diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 48543be..a4217b9 100644 (file)
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -40,6 +40,9 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
 # Where are stored data for your application. Pictures, static resources must be placed in that folder.
 # set(PROJECT_RESOURCES "data")
 
+# Which directories inspect to find CMakeLists.txt target files
+# set(PROJECT_SRC_DIR_PATTERN "*")
+
 # Compilation Mode (DEBUG, RELEASE)
 # ----------------------------------
 set(CMAKE_BUILD_TYPE "DEBUG")
@@ -134,3 +137,8 @@ set(WIDGET_ENTRY_POINT lib/afb-low-can.so)
 #------------------------------------------------------------
 #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
+# -----------------------------------------------------------
+include(${PROJECT_APP_TEMPLATES_DIR}/cmake/common.cmake)