Tino has proposed merging lp:~widelands-dev/widelands/remove_signals into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/remove_signals/+merge/200501
I am proposing to merge this branch before b18, because:
- the CMake change regarding boost signals library is overdue. With the current
state you are forced to compile the signals library to make the build work,
even when it is not going to be linked.
- the activiation for the large address space on win32 should be safe. It was
included in the windows test builds now for 5 weeks.
--
https://code.launchpad.net/~widelands-dev/widelands/remove_signals/+merge/200501
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/remove_signals into lp:widelands.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-09-06 15:01:38 +0000
+++ CMakeLists.txt 2014-01-06 08:54:05 +0000
@@ -114,10 +114,10 @@
else (DEFINED MSVC)
set (Boost_USE_STATIC_LIBS OFF)
endif (DEFINED MSVC)
- set (Boost_FIND_COMPONENTS unit_test_framework signals)
+ set (Boost_FIND_COMPONENTS unit_test_framework)
set (Boost_USE_MULTITHREADED ON)
set (Boost_DETAILED_FAILURE_MSG ON)
- find_package(Boost 1.48 COMPONENTS unit_test_framework signals REQUIRED)
+ find_package(Boost 1.48 COMPONENTS unit_test_framework REQUIRED)
if (NOT DEFINED MSVC)
# If boost unit test library is linked dynamically, BOOST_TEST_DYN_LINK must be defined
@@ -141,16 +141,7 @@
)
else (WL_UNIT_TESTS)
message(STATUS "Disabled Unit Tests")
- set (Boost_FIND_COMPONENTS signals)
- if (DEFINED MSVC)
- set (Boost_USE_STATIC_RUNTIME ON)
- set (Boost_USE_STATIC_LIBS ON)
- else (DEFINED MSVC)
- set (Boost_USE_STATIC_LIBS OFF)
- endif(DEFINED MSVC)
- set (Boost_USE_MULTITHREADED ON)
- set (Boost_DETAILED_FAILURE_MSG ON)
- find_package(Boost 1.48 COMPONENTS signals REQUIRED)
+ find_package(Boost 1.48 REQUIRED)
endif (WL_UNIT_TESTS)
option (WL_STRICT "If strict compilation mode is requested (almost every warning is an error)" OFF)
@@ -317,6 +308,11 @@
set (CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /LTCG /NODEFAULTLIB:libcmt.lib" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
endif (DEFINED MSVC)
+IF (MINGW)
+ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--large-address-aware" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
+ message (STATUS "Enabled large address awareness on mingw32")
+endif (MINGW)
+
IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
message (STATUS "Using compiler flags: ${CMAKE_CXX_FLAGS_DEBUG}")
ELSE (CMAKE_BUILD_TYPE STREQUAL "Debug")
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
