summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-23 15:26:38 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-31 16:54:24 +0100
commitdf68cd9163cc7a6e9196b774bed2aa7aea4c3516 (patch)
treeb6b201f7724d3eb3d64ebf1a84ad38820ac0839a
parent127f4fbe0ee9aced18844ffd2d238e277aadcc7d (diff)
Bug-AGL SPEC-1682 Change-Id: Id339de43e778d0d2ba478f98541c8330f8d0b1be Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--agl-speech-afb/CMakeLists.txt1
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake26
3 files changed, 15 insertions, 12 deletions
diff --git a/agl-speech-afb/CMakeLists.txt b/agl-speech-afb/CMakeLists.txt
index 565a3e7..8bdfdde 100644
--- a/agl-speech-afb/CMakeLists.txt
+++ b/agl-speech-afb/CMakeLists.txt
@@ -27,7 +27,6 @@ PROJECT_TARGET_ADD(simpleservice)
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 a3c312ece0a77310a9d8ecde1dd0f1267646f4f
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 3f1c8f7..8693cf2 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -18,20 +18,21 @@
# Project Info
# ------------------
-set(PROJECT_NAME helloworld-service)
+set(PROJECT_NAME agl-service-speech)
set(PROJECT_VERSION "1.0")
-set(PROJECT_PRETTY_NAME "Helloworld for AGL")
-set(PROJECT_DESCRIPTION "Provide an AGL Helloworld Binding")
-set(PROJECT_URL "https://github.com/iotbzh/helloworld-service")
+set(PROJECT_PRETTY_NAME "AGL service speech binding")
+set(PROJECT_DESCRIPTION "Provide an AGL speech Binding")
+set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/p/apps/agl-service-speech.git")
set(PROJECT_ICON "icon.png")
set(PROJECT_AUTHOR "Iot-Team")
set(PROJECT_AUTHOR_MAIL "secretaria@iot.bzh")
set(PROJECT_LICENSE "APL2.0")
set(PROJECT_LANGUAGES,"C")
+set(API_NAME "agl-speech")
-# 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 +46,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG")
+set(BUILD_TYPE "RELEASE")
# Kernel selection if needed. You can choose between a
# mandatory version to impose a minimal version.
@@ -97,8 +98,8 @@ set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install
#set(C_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C language.")
#set(CXX_COMPILE_OPTIONS "" CACHE STRING "Compilation flags for C++ language.")
#set(PROFILING_COMPILE_OPTIONS "-g" "-O0" "-pg" "-Wp,-U_FORTIFY_SOURCE" CACHE STRING "Compilation flags for PROFILING build type.")
-#set(DEBUG_COMPILE_OPTIONS "-g" "-ggdb" "-Wp,-U_FORTIFY_SOURCE" CACHE STRING "Compilation flags for DEBUG build type.")
-#set(CCOV_COMPILE_OPTIONS "-g" "-O2" "--coverage" CACHE STRING "Compilation flags for CCOV build type.")
+#set(DEBUG_COMPILE_OPTIONS "-g" "-O0" "-ggdb" CACHE STRING "Compilation flags for DEBUG build type.")
+#set(COVERAGE_COMPILE_OPTIONS "-g" "-O0" "--coverage" CACHE STRING "Compilation flags for COVERAGE build type.")
#set(RELEASE_COMPILE_OPTIONS "-g" "-O2" CACHE STRING "Compilation flags for RELEASE build type.")
# Print a helper message when every thing is finished
@@ -108,7 +109,7 @@ set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install
# (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable]
# ---------------------------------------------------------------------
-set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+set(INSTALL_PREFIX $ENV{HOME}/opt)
set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib)
@@ -180,5 +181,8 @@ set(WIDGET_ENTRY_POINT config.xml)
# 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)