[cmake] debug is on by default if branch is dev - can be disabled by …

…command line option -DDEBUG
hugsy · Jun 15, 2015 · 9f714d3 · 9f714d3
1 parent 38a3c29
commit 9f714d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,15 +52,16 @@ option(USE_PERL_PLUGIN        "Add Perl script support"                ON)
 option(USE_TCL_PLUGIN         "Add Tcl script support"                 ON)
 option(USE_JAVA_PLUGIN        "Add Java script support"                ON)
 
-option(DEBUG                  "Enable Debug"                           OFF)
-option(DEBUG_SSL              "Enable SSL debug"                       OFF)
-option(DEBUG_LEAK             "Enable memleak checks"                  OFF)
-
 # enforcing debug compil when in branch dev
 if(GIT_RELEASE_BRANCH STREQUAL "dev")
-  set(DEBUG ON)
+  option(DEBUG                  "Enable Debug"                           ON)
+else()
+  option(DEBUG                  "Enable Debug"                           OFF)
 endif()
 
+option(DEBUG_SSL              "Enable SSL debug"                       OFF)
+option(DEBUG_LEAK             "Enable memleak checks"                  OFF)
+
 if (DEBUG)
   set(CMAKE_BUILD_TYPE Debug)
   set(CMAKE_C_FLAGS_DEBUG "-ggdb -DDEBUG -O0")

diff --git a/proxenet-plugins b/proxenet-plugins