From e6fb23a5eaf94b043a45efa5f67926b4ef2aace9 Mon Sep 17 00:00:00 2001 From: navarrop Date: Tue, 29 Mar 2011 14:52:02 +0000 Subject: [PATCH] Add option enable_debug by default 'on'. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9884 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/Flags.cmake | 8 ++++++-- buildtools/Cmake/Option.cmake | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake index fc99b1ea18..180fcd2c70 100644 --- a/buildtools/Cmake/Flags.cmake +++ b/buildtools/Cmake/Flags.cmake @@ -8,8 +8,6 @@ else(NOT __VISUALC__ AND NOT __BORLANDC__) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/Zi") endif(NOT __VISUALC__ AND NOT __BORLANDC__) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${custom_flags}") - if(enable_compile_warnings) set(warnCFLAGS "-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ") endif(enable_compile_warnings) @@ -18,8 +16,14 @@ if(enable_compile_optimizations) set(optCFLAGS "-O3 -finline-functions -funroll-loops -fno-strict-aliasing ") endif(enable_compile_optimizations) +if(enable_debug) + set(CMAKE_C_FLAGS "-DNDEBUG ${CMAKE_C_FLAGS}") +endif(enable_debug) + set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${custom_flags}") + if(enable_coverage) find_program(GCOV_PATH gcov) if(GCOV_PATH) diff --git a/buildtools/Cmake/Option.cmake b/buildtools/Cmake/Option.cmake index 1d521182d3..60e1b0946d 100644 --- a/buildtools/Cmake/Option.cmake +++ b/buildtools/Cmake/Option.cmake @@ -37,6 +37,7 @@ option(enable_print_message "Enable print message during config." off) option(enable_model-checking "" off) option(enable_lib_static "" off) option(enable_jedule "Jedule output of SimDAG." off) +option(enable_debug "Set NDEBUG flag" on) if(enable_supernovae AND enable_model-checking) set(enable_model-checking false CACHE TYPE INTERNAL FORCE) -- 2.20.1