[Commits] [wesnoth/wesnoth] bdc2f0: Fix the travis linking issue with cmake and g++-4....

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: bdc2f06c11ab3f1883b3023023c39e1960c11e36
      https://github.com/wesnoth/wesnoth/commit/bdc2f06c11ab3f1883b3023023c39e1960c11e36
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M .travis.yml
    M src/CMakeLists.txt

  Log Message:
  -----------
  Fix the travis linking issue with cmake and g++-4.7.

This explicitly adds the dependencies to wesnoth to control the order
of the linking in order to avoid linker errors due to parameter order.

Also take out -O parameter to the cmake build as it's not used since
cmake has its own settings for a release build.


  Commit: c6510e9d79c8e19a10c411ae624b7d7b548eec09
      https://github.com/wesnoth/wesnoth/commit/c6510e9d79c8e19a10c411ae624b7d7b548eec09
  Author: Andreas Löf <andreas at alternating.net>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M INSTALL
    M data/multiplayer/scenarios/2p_Hornshark_Island.cfg
    M src/desktop/dbus_notification.cpp
    M src/desktop/open.cpp
    M src/server/player_connection.hpp
    M src/server/server.cpp
    M src/server/server.hpp
    M src/tests/test_lua.cpp

  Log Message:
  -----------
  Merge branch 'master' of github.com:wesnoth/wesnoth


Compare: https://github.com/wesnoth/wesnoth/compare/1ec81a3506e3...c6510e9d79c8