From d1845cf62f850f6ef8ed9c344df431fc8195a098 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 23 Oct 2018 15:26:35 +0200 Subject: Migrate app-templates to CMake module Bug-AGL SPEC-1682 Change-Id: I707b8d6a9aee0a1bce8b3bad17d4a07d981a0c3a Signed-off-by: Romain Forlot --- conf.d/app-templates | 1 - conf.d/cmake/config.cmake | 11 +++++++---- 2 files changed, 7 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 76e12e7..0000000 --- a/conf.d/app-templates +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 76e12e76c7065fb3440312af3e54eae9d40c5254 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 9be9ab0..4c69dcc 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 "iiodevices") -# 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. @@ -45,7 +45,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates") # Compilation Mode (DEBUG, RELEASE) # ---------------------------------- -set(BUILD_TYPE "DEBUG") +set(BUILD_TYPE "RELEASE") # Kernel selection if needed. You can choose between a # mandatory version to impose a minimal version. @@ -157,5 +157,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) -- cgit 1.2.3-korg