summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortkummermehr <thorsten.kummermehr@k2l.de>2017-11-23 09:41:35 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:51:59 +0100
commit41a8a88b4cab3b02cafbee889ce614f24f91535f (patch)
tree753efeab0653dd896e5ad2206a1b0dc9c4a48826
parent930e93ebef7847911533a5789f9ca687eaccb1af (diff)
Migrate app-templates to CMake moduleguppy_6.99.1guppy/6.99.16.99.1
Bug-AGL SPEC-1682 Change-Id: I5fe7104d8e7e724e8949ff33fc50a0968387b650 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
m---------conf.d/app-templates0
-rw-r--r--conf.d/project/config.cmake9
-rw-r--r--ucs2-afb/CMakeLists.txt1
3 files changed, 6 insertions, 4 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates
deleted file mode 160000
-Subproject 0f25ab2fa35a36c8d9b4675522f1ecb9ec74d88
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
)