summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-23 15:49:46 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:51:51 +0100
commit2a7b4defe300dfe5eb19f775bd819e2d300b7453 (patch)
tree3c4f5605fe8463674a04093a5475e10b28bc69b0
parenta50f22bf445407175dfb4cfa55f68970a0e27379 (diff)
Migrate app-templates to CMake module
Bug-AGL SPEC-1682 Change-Id: Icf7eb9765483e1cf1c74a9d64cdb0178f773936d Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake9
-rw-r--r--src/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 e7fd1dac52b20115922737637544919cb86164a
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 582ed07..ba64f50 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -29,9 +29,9 @@ set(PROJECT_LICENSE "APL2.0")
set(PROJECT_LANGUAGES "C")
set(API_NAME "aft")
-# 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.
@@ -201,5 +201,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/src/CMakeLists.txt b/src/CMakeLists.txt
index 5bbe7e8..e6351fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,6 @@ PROJECT_TARGET_ADD(aft)
SET_TARGET_PROPERTIES(${TARGET_NAME} PROPERTIES
PREFIX ""
LABELS "BINDING"
- LINK_FLAGS ${BINDINGS_LINK_FLAG}
OUTPUT_NAME ${TARGET_NAME}
)