X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=CMakeLists.txt;h=ca212d47b645f14943363775667befa612de3624;hb=f7261ab4d99a62a7d6f3ff1810825049f9ebcc0a;hp=e83c4429f4fe427404bfe269f51a6e9631a9283c;hpb=2807b13d3c97eab1b7e257e8554c052a4a94775b;p=supertux.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e83c4429f..ca212d47b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,11 +164,15 @@ FILE(GLOB SUPERTUX_SOURCES RELATIVE ${SUPERTUX_SOURCE_DIR} src/*.cpp src/audio/*
 
 OPTION(DEBUG "Build with debugging options" OFF)
 OPTION(PROFILE "Build with profiling information" OFF)
-OPTION(WERROR "Build stops on first compiler warning" OFF)
+OPTION(WERROR "Stops on first compiler warning in debug mode" ON)
 IF(CMAKE_COMPILER_IS_GNUCC)
+  ADD_DEFINITIONS(-Wall -W)
   IF (DEBUG)
     REMOVE_DEFINITIONS(-O2)
     ADD_DEFINITIONS(-O0 -g)
+    IF(WERROR)
+      ADD_DEFINITIONS(-Werror)
+    ENDIF(WERROR)
   ELSE (DEBUG)
     ADD_DEFINITIONS(-O2)
     REMOVE_DEFINITIONS(-O0 -g)
@@ -178,11 +182,6 @@ IF(CMAKE_COMPILER_IS_GNUCC)
   ELSE (PROFILE)
     REMOVE_DEFINITIONS(-pg)
   ENDIF (PROFILE)
-  IF (WERROR)
-    ADD_DEFINITIONS(-Wall -Werror)
-  ELSE (WERROR)
-    REMOVE_DEFINITIONS(-Wall -Werror)
-  ENDIF (WERROR)
 ENDIF(CMAKE_COMPILER_IS_GNUCC)
 
 ## Add in squirrel debug stuff