widelands-dev team mailing list archive

[Hans Joachim Desserud <launchpad@xxxxxxxxxxxx>]

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/add_flag into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~hjd/widelands/add_flag/+merge/226741

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.


-- 
https://code.launchpad.net/~hjd/widelands/add_flag/+merge/226741
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/add_flag into lp:widelands.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-14 14:40:58 +0000
+++ CMakeLists.txt	2014-07-14 20:35:33 +0000
@@ -128,12 +128,12 @@
   # Assuming GCC 4.7 or higher.
   if(WIN32)
     # This is needed for getenv().
-    add_flag(WL_GENERIC_CXX_FLAGS "-std=gnu++11")
+    wl_add_flag(WL_GENERIC_CXX_FLAGS "-std=gnu++11")
   endif()
 
   if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8))
      # Because of: https://svn.boost.org/trac/boost/ticket/9240.
-     add_flag(WL_GENERIC_CXX_FLAGS "-fext-numeric-literals")
+     wl_add_flag(WL_GENERIC_CXX_FLAGS "-fext-numeric-literals")
   endif()
 
   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wall")