Be able to overwrite BUILD_TYPE using CLI

If not defined using CLI CMake set the variable CMAKE_BUILD_TYPE
to an empty value. As it is a CACHE variable it can't be
overwritten except if you force it. This fix setting this variable
the first defined value wins:

CLI > Config.cmake > Default value (DEBUG)

Change-Id: I7ff3c9063febf71b898fa7f19058ce2fb25fae01
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>

diff --git a/cmake/cmake.d/01-build_options.cmake b/cmake/cmake.d/01-build_options.cmake
index 36830f1..18aff71 100644 (file)
--- a/cmake/cmake.d/01-build_options.cmake
+++ b/cmake/cmake.d/01-build_options.cmake
@@ -32,7 +32,14 @@ INCLUDE(CheckIncludeFiles)
 INCLUDE(CheckLibraryExists)
 INCLUDE(GNUInstallDirs)
 
-set(CMAKE_BUILD_TYPE Debug CACHE STRING "the type of build")
+if(NOT CMAKE_BUILD_TYPE)
+       if(BUILD_TYPE)
+               set(CMAKE_BUILD_TYPE ${BUILD_TYPE} CACHE STRING "the type of build" FORCE)
+       else()
+               set(CMAKE_BUILD_TYPE DEBUG CACHE STRING "the type of build" FORCE)
+       endif()
+endif()
+
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMP0048 1)
 

diff --git a/samples.d/config.cmake.sample b/samples.d/config.cmake.sample
index d7268cd..70715fc 100644 (file)
--- a/samples.d/config.cmake.sample
+++ b/samples.d/config.cmake.sample
@@ -41,7 +41,7 @@ set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
 
 # Compilation Mode (DEBUG, RELEASE)
 # ----------------------------------
-#set(CMAKE_BUILD_TYPE "DEBUG")
+#set(BUILD_TYPE "DEBUG")
 #set(USE_EFENCE 1)
 
 # Kernel selection if needed. You can choose between a