summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2018-10-10 17:18:01 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-11 11:41:18 +0200
commita04ac76e35cada5b8a21454288d5a42482296d1b (patch)
tree23238e2e1cc423df14af662abb332c7bafe725b5
parent04888c6e029eeef7d25c7802cd9020eda9e44aac (diff)
Update app-template submodule.
Updating project configuration file following the app-template submodule update which let the command-line argument override the project configuration. Submodule conf.d/app-templates 76e12e7..0f25ab2: > Adding warning message to migrate on CMake module > common.cmake: fixed erroneous search path for os-release > Fix: missing gcov symbol in compiled binaries Bugs-AGL: SPEC-1798 Change-Id: I614f2fc6e2ff9b95a62e5a3113930b9181bbcd2a Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
m---------conf.d/app-templates0
-rw-r--r--conf.d/project/config.cmake5
2 files changed, 2 insertions, 3 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject 76e12e76c7065fb3440312af3e54eae9d40c525
+Subproject 0f25ab2fa35a36c8d9b4675522f1ecb9ec74d88
diff --git a/conf.d/project/config.cmake b/conf.d/project/config.cmake
index cceb079..3fe7666 100644
--- a/conf.d/project/config.cmake
+++ b/conf.d/project/config.cmake
@@ -45,7 +45,7 @@ set(PROJECT_SRC_DIR_PATTERN "[^_]*")
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
-set(CMAKE_BUILD_TYPE "DEBUG")
+set(BUILD_TYPE "DEBUG")
#Disabled because causes crash on some machines
#set(USE_EFENCE 1)
@@ -73,14 +73,13 @@ set (PKG_REQUIRED_LIST
json-c
libsystemd>=222
afb-daemon
- libmicrohttpd>=0.9.55
libxml-2.0
)
# Prefix path where will be installed the files
# Default: /usr/local (need root permission to write in)
# ------------------------------------------------------
-set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+set(INSTALL_PREFIX $ENV{HOME}/opt)
# Customize link option
# -----------------------------