widelands-dev team mailing list archive

[David Allwicher <aber@xxxxxxxxxxxxxxx>]

David Allwicher has proposed merging lp:~aber/widelands/gcc into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~aber/widelands/gcc/+merge/89785
-- 
https://code.launchpad.net/~aber/widelands/gcc/+merge/89785
Your team Widelands Developers is requested to review the proposed merge of lp:~aber/widelands/gcc into lp:widelands.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-01-15 13:39:00 +0000
+++ CMakeLists.txt	2012-01-23 21:00:34 +0000
@@ -219,10 +219,10 @@
         message("Detected gcc ${WLBUILD_COMPILERVERSION_REP}")
         message("Suffering from gcc bug, disabling -O3")
         set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+    ELSE (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
+        #This line is the default and should be preserved.
+        set (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
     ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
-ELSE (${CMAKE_COMPILER_IS_GNUCXX})
-    #This line is the default and should be preserved.
-    set (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
 ENDIF (${CMAKE_COMPILER_IS_GNUCXX})
 
 #If building with MSVC, then check for 3rdparty libs