unify WITH_DEBUG with CMAKE_BUILD_TYPE; show TRACE_LEVEL in status

CMakeLists.txt

@@ -16,6 +16,15 @@ if(CMAKE_COMPILER_IS_GNUCC)
   add_definitions(-std=c99 -Wall -Wextra -pedantic -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wconversion -Wstrict-prototypes)
 endif(CMAKE_COMPILER_IS_GNUCC)
 
+# Set to debug build if no such choice was made
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Debug)
+endif(NOT CMAKE_BUILD_TYPE)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(WITH_DEBUG ON)
+endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
+
 if(WITH_SYSTEM_CALLS STREQUAL "mmap")
   set(PAGESIZE_ALIGN ON)
   if(NOT DEFINED SYS_ALLOC_SIZE)
@@ -171,6 +180,7 @@ endif(RAW_BLOCKS_TYPE STREQUAL "freelist")
 message(STATUS "Have statistics: " ${STATS})
 message(STATUS "Requested Size per Block: " ${REQUEST_SIZE_INFO})
 message(STATUS "Support for debug functions: " ${WITH_DEBUG})
+message(STATUS "Trace level: " ${TRACE_LEVEL})
 message(STATUS "Adaptivity: " ${WITH_ADAPTIVITY})
 message(STATUS "Support for realloc(): " ${WITH_REALLOC})
 message(STATUS "Support for calloc(): " ${WITH_CALLOC})

DefineOptions.cmake

@@ -31,10 +31,9 @@ option(WITH_CALLOC "Build with calloc" ON)
 set(STATS "none" CACHE STRING "Choose if the memory allocator keeps internally statistics per raw block or globally, options are: none, global")
 set(REQUEST_SIZE_INFO OFF)
 
-# Debugging Settings
+# Trace Settings
 
 set(TRACE_LEVEL 0 CACHE INTEGER "Choose the trace level, options are: 0, 1, 2 and 3")
-option(WITH_DEBUG "Build with debugging functions" OFF)
 
 # Build Settings
 
@@ -64,7 +63,6 @@ if(P2012)
   set(WITH_CALLOC OFF)
   set(STATS "none")
   set(TRACE_LEVEL 0)
-  set(WITH_DEBUG OFF)
   set(WITH_STATIC_LIB ON)
   set(WITH_SHARED_LIB OFF)
   set(WITH_EXAMPLES OFF)
@@ -83,7 +81,6 @@ if(LEON3)
   set(WITH_CALLOC OFF)
   set(STATS "none")
   set(TRACE_LEVEL 0)
-  set(WITH_DEBUG OFF)
   set(WITH_STATIC_LIB ON)
   set(WITH_SHARED_LIB OFF)
   set(WITH_EXAMPLES OFF)
@@ -97,7 +94,6 @@ if(LINUX)
   set(RAW_BLOCKS_TYPE "bitmap")
   set(BITMAP_RESOLUTION 256)
   set(TRACE_LEVEL 3)
-  set(WITH_DEBUG OFF)
   set(WITH_REALLOC ON)
   set(WITH_CALLOC ON)
   set(STATS "global")

src/CMakeLists.txt

@@ -1,9 +1,5 @@
 project (dmmlib-library C)
 
-if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Debug)
-endif(NOT CMAKE_BUILD_TYPE)
-
 set(DMMLIB_PUBLIC_INCLUDE_DIRS
   ${CMAKE_SOURCE_DIR}/include
   CACHE INTERNAL "dmmlib public include directories"