upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-22 22:49:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Bump min Boost version to 1.56.0""

Browse Source 
This reverts commit cdf9b465c668648721c4638ce117da130ad36284.

May this noise be my vengeance.
This commit is contained in:
Iris Morelle 2018-03-24 01:53:25 -03:00
parent cdf9b465c6
commit f6a128579a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -80,7 +80,7 @@ endif()
find_package(SDL2 2.0.4 REQUIRED) find_package(SDL2 2.0.4 REQUIRED)
find_package(Crypto 1.0 REQUIRED) find_package(Crypto 1.0 REQUIRED)
find_package(Boost 1.50 REQUIRED COMPONENTS iostreams program_options regex system thread random) find_package(Boost 1.56 REQUIRED COMPONENTS iostreams program_options regex system thread random)
# no, gettext executables are not required when NLS is deactivated # no, gettext executables are not required when NLS is deactivated
find_package(Gettext) find_package(Gettext)
@ -478,7 +478,7 @@ if(ENABLE_GAME OR ENABLE_TESTS)
endif(ENABLE_GAME OR ENABLE_TESTS) endif(ENABLE_GAME OR ENABLE_TESTS)
if(ENABLE_TESTS) if(ENABLE_TESTS)
find_package( Boost 1.36 REQUIRED COMPONENTS unit_test_framework ) find_package( Boost 1.56 REQUIRED COMPONENTS unit_test_framework )
endif(ENABLE_TESTS) endif(ENABLE_TESTS)
if(ENABLE_GAME) if(ENABLE_GAME)
@ -517,8 +517,8 @@ if(ENABLE_GAME)
endif(ENABLE_HISTORY AND HISTORY_FOUND) endif(ENABLE_HISTORY AND HISTORY_FOUND)
endif(ENABLE_GAME) endif(ENABLE_GAME)
find_package(Boost 1.50 REQUIRED COMPONENTS filesystem) find_package(Boost 1.56 REQUIRED COMPONENTS filesystem)
find_package(Boost 1.50 REQUIRED COMPONENTS locale) find_package(Boost 1.56 REQUIRED COMPONENTS locale)
if(ENABLE_POT_UPDATE_TARGET) if(ENABLE_POT_UPDATE_TARGET)
find_package(TranslationTools REQUIRED) find_package(TranslationTools REQUIRED)

2
INSTALL.md
View File

@ -16,7 +16,7 @@ later, or Clang 3.8 and later.
You'll need to have these libraries and their development headers installed in You'll need to have these libraries and their development headers installed in
order to build Wesnoth: order to build Wesnoth:
* Boost libraries >= 1.50.0 * Boost libraries >= 1.56.0
Most headers plus the following binary libs: Most headers plus the following binary libs:
* Filesystem * Filesystem
* Locale * Locale

2
SConstruct
View File

@ -179,7 +179,7 @@ if env['distcc']:
if env['ccache']: env.Tool('ccache') if env['ccache']: env.Tool('ccache')
boost_version = '1.50.0' boost_version = '1.56.0'
Help("""Arguments may be a mixture of switches and targets in any order. Help("""Arguments may be a mixture of switches and targets in any order.