Skip to content

Commit

Permalink
Revert "Revert "Bump min Boost version to 1.56.0""
Browse files Browse the repository at this point in the history
This reverts commit cdf9b46.

May this noise be my vengeance.
  • Loading branch information
irydacea committed Mar 24, 2018
1 parent cdf9b46 commit f6a1285
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Expand Up @@ -80,7 +80,7 @@ endif()

find_package(SDL2 2.0.4 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
find_package(Gettext)
Expand Down Expand Up @@ -478,7 +478,7 @@ if(ENABLE_GAME OR ENABLE_TESTS)
endif(ENABLE_GAME OR 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)

if(ENABLE_GAME)
Expand Down Expand Up @@ -517,8 +517,8 @@ if(ENABLE_GAME)
endif(ENABLE_HISTORY AND HISTORY_FOUND)
endif(ENABLE_GAME)

find_package(Boost 1.50 REQUIRED COMPONENTS filesystem)
find_package(Boost 1.50 REQUIRED COMPONENTS locale)
find_package(Boost 1.56 REQUIRED COMPONENTS filesystem)
find_package(Boost 1.56 REQUIRED COMPONENTS locale)

if(ENABLE_POT_UPDATE_TARGET)
find_package(TranslationTools REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
Expand Up @@ -16,7 +16,7 @@ later, or Clang 3.8 and later.
You'll need to have these libraries and their development headers installed in
order to build Wesnoth:

* Boost libraries >= 1.50.0
* Boost libraries >= 1.56.0
Most headers plus the following binary libs:
* Filesystem
* Locale
Expand Down
2 changes: 1 addition & 1 deletion SConstruct
Expand Up @@ -179,7 +179,7 @@ if env['distcc']:

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.
Expand Down

0 comments on commit f6a1285

Please sign in to comment.