From 41a8a88b4cab3b02cafbee889ce614f24f91535f Mon Sep 17 00:00:00 2001
From: tkummermehr <thorsten.kummermehr@k2l.de>
Date: Thu, 23 Nov 2017 09:41:35 +0100
Subject: Migrate app-templates to CMake module
Bug-AGL SPEC-1682
Change-Id: I5fe7104d8e7e724e8949ff33fc50a0968387b650
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
conf.d/app-templates | 1 -
conf.d/project/config.cmake | 9 ++++++---
ucs2-afb/CMakeLists.txt | 1 -
3 files changed, 6 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/project/config.cmake b/conf.d/project/config.cmake
index 3fe7666..a5709f3 100644
--- a/conf.d/project/config.cmake
+++ b/conf.d/project/config.cmake
@@ -29,9 +29,9 @@ set(PROJECT_AUTHOR_MAIL "thorsten.kummermehr@microchip.com")
set(PROJECT_LICENSE "Apache-V2")
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.
@@ -211,5 +211,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)
diff --git a/ucs2-afb/CMakeLists.txt b/ucs2-afb/CMakeLists.txt
index 2f5141d..2f99b58 100644
--- a/ucs2-afb/CMakeLists.txt
+++ b/ucs2-afb/CMakeLists.txt
@@ -28,7 +28,6 @@ PROJECT_TARGET_ADD(ucs2-afb)
SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
PREFIX "afb-"
LABELS "BINDINGV2"
- LINK_FLAGS ${BINDINGS_LINK_FLAG}
OUTPUT_NAME ucs2
)
--
cgit