summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Collignon [ IoT.bzh ] <loic.collignon@iot.bzh>2018-10-23 12:45:28 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2018-10-23 12:45:28 +0000
commitb5cd03426117d0f4ee1ee13b4a932ff7ef3ea6a7 (patch)
tree289c9d482c84eaf564d0cb4455fb57efa58daf05
parentaf458acb2605292b4fd2693f770b5e3b5e61c600 (diff)
parentc3ca0fb92fa57901fbc33a27ebe155616ecf6329 (diff)
Merge "Use latest version of app-templates submodule."
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/config.cmake8
2 files changed, 1 insertions, 7 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject 332f377e84a673cdcfe52ce71c932f39c4b4802
+Subproject d6c7b9663f735fc29e68bfb7a55b2025a6a650a
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 00b8141..4ff2fe5 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -38,13 +38,7 @@ set(PROJECT_SRC_DIR_PATTERN "[^_]*")
# Compilation Mode (DEBUG, RELEASE)
# ----------------------------------
# Set a default build type if none was specified
-set(default_build_type "Debug")
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
- set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE STRING "Choose the type of build." FORCE)
- # Set the possible values of build type for cmake-gui
- set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-endif()
+set(BUILD_TYPE "Debug")
# Alsa does not really like libEfence
set(USE_EFENCE 0)