diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72504cf..0a62dc8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,19 +43,17 @@ if(CMAKE_CROSSCOMPILING)
 	endif()
 endif()
 option(LIB "System install" 1)
-option(DEBUG "Build with -g3" 0)
 option(QGLVIEW "Build QGLview library and utils" 1)
 option(QGLENGINE "Build QGLENGINE library and utils" 0)
 option(UTILS "Build various utils" 1)
 option(DESIGNER_PLUGINS "Build qt designer plugins" 1)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
-#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=native")
-if (DEBUG)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
-endif ()
+if (CMAKE_BUILD_TYPE MATCHES Debug)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -Wall")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3 -Wall")
+else()
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
+	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wall")
+endif()
 set(CMAKE_CXX_STANDARD 11)
 
 set(PIP_LIBRARY pip)