From: Romain Forlot <romain.forlot@iot.bzh>
Date: Wed, 24 May 2017 13:13:38 +0000 (+0200)
Subject: Add variable indicating where is app-templates repo clone
X-Git-Tag: 3.99.2~84
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=bd37e33352242ebbc3278e3d6683bf07df0f6649;p=apps%2Fapp-templates.git

Add variable indicating where is app-templates repo clone

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

diff --git a/default/cmake/common.cmake b/default/cmake/common.cmake
index 1d2974e..05a3236 100644
--- a/default/cmake/common.cmake
+++ b/default/cmake/common.cmake
@@ -340,13 +340,13 @@ endif()
 set(PROJECT_PKG_ENTRY_POINT ${CMAKE_SOURCE_DIR}/packaging CACHE PATH "Where package build files, like rpm.spec file or config.xml, are write.")
 
 set (PKG_TEMPLATE_PREFIX ${CMAKE_SOURCE_DIR}/etc CACHE PATH "Default Package Templates Directory")
-set(TEMPLATE_WGT_DIR "${CMAKE_SOURCE_DIR}/conf.d/app-templates/wgt" CACHE PATH "Subpath to a directory where are stored needed files to build widget")
-set(TEMPLATE_RPM_DIR "${CMAKE_SOURCE_DIR}/conf.d/app-templates/rpm" CACHE PATH "Subpath to a directory where are stored needed files to build rpm package")
-set(TEMPLATE_DEB_DIR "${CMAKE_SOURCE_DIR}/conf.d/app-templates/deb" CACHE PATH "Subpath to a directory where are stored needed files to build deb package")
+set(TEMPLATE_WGT_DIR "${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/wgt" CACHE PATH "Subpath to a directory where are stored needed files to build widget")
+set(TEMPLATE_RPM_DIR "${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/rpm" CACHE PATH "Subpath to a directory where are stored needed files to build rpm package")
+set(TEMPLATE_DEB_DIR "${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/deb" CACHE PATH "Subpath to a directory where are stored needed files to build deb package")
 
 # Default Linkflag
 if(NOT BINDINGS_LINK_FLAG)
-	set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/conf.d/app-templates/cmake/export.map")
+	set(BINDINGS_LINK_FLAG "-Wl,--version-script=${CMAKE_SOURCE_DIR}/${PROJECT_APP_TEMPLATES_DIR}/default/cmake/export.map")
 endif()
 
 # Add a dummy target to enable global dependency order
diff --git a/default/cmake/config.cmake.sample b/default/cmake/config.cmake.sample
index a7386c0..66be37c 100644
--- a/default/cmake/config.cmake.sample
+++ b/default/cmake/config.cmake.sample
@@ -29,6 +29,10 @@ set(PROJECT_AUTHOR_MAIL "example.man@bigouden.bzh")
 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
+# relative to the root project directory
+set(PROJECT_APP_TEMPLATES_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.
 # set(PROJECT_LIBDIR "libs")