From c3ca0fb92fa57901fbc33a27ebe155616ecf6329 Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Fri, 19 Oct 2018 09:38:12 +0200 Subject: Use latest version of app-templates submodule. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes of conf.d/app-templates: (d6c7b96 - Romain Forlot) Minor fixes (35065ca - Romain Forlot) Improved test widget launcher script (f75c2d7 - Romain Forlot) Set default link flags to the target property (765504e - Romain Forlot) Use a custom test-config.xml file for test widget (210e7a7 - Matt Ranostay) cmake: coverage: disable compiler optimization for COVERAGE build (0f25ab2 - Romain Forlot) Adding warning message to migrate on CMake module (3dc85ec - Thierry Bultel) common.cmake: fixed erroneous search path for os-release (7fa5e5a - Romain Forlot) Fix: missing gcov symbol in compiled binaries (76e12e7 - CorentinLGS) app-templates doc: Changed doc to fit new format. (02f45f1 - Romain Forlot) Update Docs (52ae181 - Romain Forlot) Fix: typo (f0b24b0 - Romain Forlot) Rollback about TEST build type (e841a77 - Romain Forlot) Adding a TEST build type (994ebc1 - Romain Forlot) Change default compilation options. (85d5ffd - Romain Forlot) Test widget only if there are test materials (d14bdce - Romain Forlot) Handles more test LABELS. (70cf8fd - Romain Forlot) Missing flag for COVERAGE build type (3c99b8a - Romain Forlot) Create a test widget (9c1a0fb - Romain Forlot) Fix: interpreted '&' character (9202fac - Romain Forlot) More accurate comment about widget template file. (f94e45e - Romain Forlot) Align sample on actual default compile options (d0acc2a - Romain Forlot) Add support to binding version 3. (6fb3846 - Romain Forlot) Warning if not using wgtpkg-pack to make a widget (35f3af1 - Sebastien Douheret) Rework CMAKE_INSTALL_PREFIX and INSTALL_PREFIX var Change-Id: Ie9bfbd48a52a56fd3a722b40e87ee92fd6ecf694 Signed-off-by: Loïc Collignon --- conf.d/app-templates | 2 +- conf.d/cmake/config.cmake | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/conf.d/app-templates b/conf.d/app-templates index 332f377..d6c7b96 160000 --- a/conf.d/app-templates +++ b/conf.d/app-templates @@ -1 +1 @@ -Subproject commit 332f377e84a673cdcfe52ce71c932f39c4b48022 +Subproject commit d6c7b9663f735fc29e68bfb7a55b2025a6a650ad 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) -- cgit 1.2.3-korg