summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-31 13:09:33 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:55:18 +0100
commit6c067df867da74cab78c987aa9299290f08c280a (patch)
treecffc26e1eea47701bffc5d22a0160a6adb4f7b09
parentb071fc0882750d28036769c56c046fe1d7ae9942 (diff)
Bug-AGL SPEC-1682 Change-Id: Iacf773877ddefb5bf40f0d998257838fdaaa61e4 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--MOST_UNICENS/CMakeLists.txt1
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake9
3 files changed, 6 insertions, 4 deletions
diff --git a/MOST_UNICENS/CMakeLists.txt b/MOST_UNICENS/CMakeLists.txt
index 5107cac..5d91d1e 100644
--- a/MOST_UNICENS/CMakeLists.txt
+++ b/MOST_UNICENS/CMakeLists.txt
@@ -28,7 +28,6 @@ PROJECT_TARGET_ADD(hal-most-unicens)
SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
PREFIX "afb-"
LABELS "BINDING"
- LINK_FLAGS ${BINDINGS_LINK_FLAG}
OUTPUT_NAME ${TARGET_NAME}
)
diff --git a/conf.d/app-templates b/conf.d/app-templates
deleted file mode 160000
-Subproject ee5d60f9d169d959cca9dc24cfc3776ed06c163
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 36050cd..4bb272f 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -29,9 +29,9 @@ set(PROJECT_AUTHOR_MAIL "fulup@iot.bzh")
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.
@@ -225,5 +225,8 @@ set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support")
# 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)