blob: 419d5d78a35bda47d266474d2e2a599d4b19108c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
From: Julian Ospald <hasufell@gentoo.org>
Date: Wed May 16 12:06:13 UTC 2012
respect CXXFLAGS
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -209,24 +209,7 @@
# CMAKE only defines "-g", but we need -DDEBUG also, and we need -DNOPARACHUTE (for SDL) in Debug
set (CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG -DNOPARACHUTE${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
-
-#This can be removed if no one uses gcc 4.5.1 or 4.5.2 any more
-IF (${CMAKE_COMPILER_IS_GNUCXX})
-EXEC_PROGRAM (
- ${CMAKE_CXX_COMPILER}
- ARGS --version
- OUTPUT_VARIABLE WLBUILD_COMPILERVERSION
- )
- STRING(REGEX REPLACE ".*(4)\\.(5)\\.([0-9]).*" "\\1.\\2.\\3" WLBUILD_COMPILERVERSION_REP ${WLBUILD_COMPILERVERSION})
- IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
- 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")
-ENDIF (${CMAKE_COMPILER_IS_GNUCXX})
+set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG" CACHE STRING "Release compiler flags" FORCE)
#If building with MSVC, then check for 3rdparty libs
if (DEFINED MSVC)
|
GitWeb
