Merge lp:~widelands-dev/widelands/remove_signals into lp:widelands

Proposed by Tino
Status: Merged
Merged at revision: 6821
Proposed branch: lp:~widelands-dev/widelands/remove_signals
Merge into: lp:widelands
Diff against target: 46 lines (+8/-12)
1 file modified
CMakeLists.txt (+8/-12)
To merge this branch: bzr merge lp:~widelands-dev/widelands/remove_signals
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+200501@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

I agree on both issues. The windows thingy could even be seen as a bug fix and the other is definitively a build bug fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-09-06 15:01:38 +0000
3+++ CMakeLists.txt 2014-01-06 08:54:05 +0000
4@@ -114,10 +114,10 @@
5 else (DEFINED MSVC)
6 set (Boost_USE_STATIC_LIBS OFF)
7 endif (DEFINED MSVC)
8- set (Boost_FIND_COMPONENTS unit_test_framework signals)
9+ set (Boost_FIND_COMPONENTS unit_test_framework)
10 set (Boost_USE_MULTITHREADED ON)
11 set (Boost_DETAILED_FAILURE_MSG ON)
12- find_package(Boost 1.48 COMPONENTS unit_test_framework signals REQUIRED)
13+ find_package(Boost 1.48 COMPONENTS unit_test_framework REQUIRED)
14
15 if (NOT DEFINED MSVC)
16 # If boost unit test library is linked dynamically, BOOST_TEST_DYN_LINK must be defined
17@@ -141,16 +141,7 @@
18 )
19 else (WL_UNIT_TESTS)
20 message(STATUS "Disabled Unit Tests")
21- set (Boost_FIND_COMPONENTS signals)
22- if (DEFINED MSVC)
23- set (Boost_USE_STATIC_RUNTIME ON)
24- set (Boost_USE_STATIC_LIBS ON)
25- else (DEFINED MSVC)
26- set (Boost_USE_STATIC_LIBS OFF)
27- endif(DEFINED MSVC)
28- set (Boost_USE_MULTITHREADED ON)
29- set (Boost_DETAILED_FAILURE_MSG ON)
30- find_package(Boost 1.48 COMPONENTS signals REQUIRED)
31+ find_package(Boost 1.48 REQUIRED)
32 endif (WL_UNIT_TESTS)
33
34 option (WL_STRICT "If strict compilation mode is requested (almost every warning is an error)" OFF)
35@@ -317,6 +308,11 @@
36 set (CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /LTCG /NODEFAULTLIB:libcmt.lib" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
37 endif (DEFINED MSVC)
38
39+IF (MINGW)
40+ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--large-address-aware" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
41+ message (STATUS "Enabled large address awareness on mingw32")
42+endif (MINGW)
43+
44 IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
45 message (STATUS "Using compiler flags: ${CMAKE_CXX_FLAGS_DEBUG}")
46 ELSE (CMAKE_BUILD_TYPE STREQUAL "Debug")

Subscribers

People subscribed via source and target branches

to status/vote changes: