2012-12-01 10:41:54 +01:00
|
|
|
--- CMakeLists.txt.orig 2012-04-23 13:46:49.000000000 +0400
|
|
|
|
|
+++ CMakeLists.txt 2012-11-30 17:28:03.093935459 +0400
|
|
|
|
|
@@ -219,12 +219,10 @@
|
|
|
|
|
)
|
|
|
|
|
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)
|
|
|
|
|
+ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -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)
|
|
|
|
|
+ set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -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})
|
2011-05-25 06:56:48 +02:00
|
|
|
|
2012-12-01 10:41:54 +01:00
|
|
|
@@ -391,10 +389,10 @@
|
|
|
|
|
find_package(ZLIB REQUIRED)
|
|
|
|
|
include_directories(${ZLIB_INCLUDE_DIR})
|
2011-05-25 06:56:48 +02:00
|
|
|
|
2012-12-01 10:41:54 +01:00
|
|
|
-if (APPLE OR WIN32)
|
|
|
|
|
+if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
|
|
|
|
find_package(intl REQUIRED)
|
|
|
|
|
include_directories(${INTL_INCLUDE_DIR})
|
|
|
|
|
-endif (APPLE OR WIN32)
|
|
|
|
|
+endif (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
|
|
|
|
|
|
|
|
|
|
find_package(SDL REQUIRED)
|
|
|
|
|
include_directories(${SDL_INCLUDE_DIR})
|
