From d43fa62bda4912580c1b790bdc4172e862aba975 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Wed, 31 Oct 2018 16:40:59 +0100 Subject: Migrate app-templates to CMake module Bug-AGL SPEC-1682 Change-Id: I9f8e4f8bb2c7a020e41215022d2528ea9c26afe1 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 (limited to 'conf.d') diff --git a/conf.d/app-templates b/conf.d/app-templates deleted file mode 160000 index 0f25ab2f..00000000 --- a/conf.d/app-templates +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0f25ab2fa35a36c8d9b4675522f1ecb9ec74d884 diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 3fbc3ef6..550409a9 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -29,16 +29,16 @@ set(PROJECT_LICENSE "APL2.0") set(PROJECT_LANGUAGES "C;CXX") set(API_NAME "low-can") -# 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") # Which directories inspect to find CMakeLists.txt target files # set(PROJECT_SRC_DIR_PATTERN "*") # Compilation Mode (DEBUG, RELEASE) # ---------------------------------- -set(CMAKE_BUILD_TYPE "DEBUG" CACHE STRING "Default Build variant chosen. (Overwritten by cli if given)") +set(BUILD_TYPE "RELEASE" CACHE STRING "Default Build variant chosen. (Overwritten by cli if given)") # Kernel selection if needed. You can choose between a # mandatory version to impose a minimal version. @@ -190,5 +190,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