aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-10-19 07:47:58 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2018-10-19 07:47:58 +0000
commit930e93ebef7847911533a5789f9ca687eaccb1af (patch)
tree6266ceb0a4ed920fd16fb8519be2873783bcb136
parent293dacac418c4881f73910e4f1664661dca740a3 (diff)
parenta04ac76e35cada5b8a21454288d5a42482296d1b (diff)
Merge "Update app-template submodule."
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
# -----------------------------