From 2c8ef7ac3c5dcf414b6e16feed5c20be20f9278b Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 23 Oct 2018 15:26:39 +0200 Subject: Migrate app-templates to CMake module Bug-AGL SPEC-1682 Change-Id: I74bf7414e3925c6aab8f8895885551c473219ce4 Signed-off-by: Romain Forlot --- conf.d/app-templates | 1 - conf.d/cmake/config.cmake | 12 ++++++++---- 2 files changed, 8 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 0f25ab2..0000000 --- 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 52eae58..1c5a020 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -27,10 +27,11 @@ set(PROJECT_AUTHOR "Last Name, First Name") set(PROJECT_AUTHOR_MAIL "mporter@konsulko.com") set(PROJECT_LICENSE "APL2.0") set(PROJECT_LANGUAGES "C") +set(API_NAME "bluetooth-pbap") -# 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. @@ -41,7 +42,7 @@ set(PROJECT_SRC_DIR_PATTERN "*") # Compilation Mode (DEBUG, RELEASE) # ---------------------------------- -set(CMAKE_BUILD_TYPE "RELEASE") +set(BUILD_TYPE "RELEASE") #set(USE_EFENCE 1) # Kernel selection if needed. You can choose between a @@ -198,5 +199,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