widelands

Merge lp:~hjd/widelands/add_flag into lp:widelands

  1. add_flag
  2. Merge into trunk
Proposed by Hans Joachim Desserud
Status: Merged
Merge reported by: SirVer
Merged at revision: not available
Proposed branch: lp:~hjd/widelands/add_flag
Merge into: lp:widelands
Diff against target: 18 lines (+2/-2)
1 file modified
CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~hjd/widelands/add_flag
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+226741@code.launchpad.net

Description of the change

Rename the remaining calls to wl_add_flag. (This method was moved out and renamed in r7086)

CMake is currently choking when attempting to build trunk with certain versions of GCC.

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

Tino did this in trunk this morning too.

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 2014-07-14 14:40:58 +0000
3+++ CMakeLists.txt 2014-07-14 20:35:33 +0000
4@@ -128,12 +128,12 @@
5 # Assuming GCC 4.7 or higher.
6 if(WIN32)
7 # This is needed for getenv().
8- add_flag(WL_GENERIC_CXX_FLAGS "-std=gnu++11")
9+ wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=gnu++11")
10 endif()
11
12 if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8))
13 # Because of: https://svn.boost.org/trac/boost/ticket/9240.
14- add_flag(WL_GENERIC_CXX_FLAGS "-fext-numeric-literals")
15+ wl_add_flag(WL_GENERIC_CXX_FLAGS "-fext-numeric-literals")
16 endif()
17
18 wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wall")

Subscribers

People subscribed via source and target branches

to status/vote changes: