From f6a128579ad6d94cc7c8a57bebd1fc2bb0f735a0 Mon Sep 17 00:00:00 2001 From: Iris Morelle Date: Sat, 24 Mar 2018 01:53:25 -0300 Subject: [PATCH] Revert "Revert "Bump min Boost version to 1.56.0"" This reverts commit cdf9b465c668648721c4638ce117da130ad36284. May this noise be my vengeance. --- CMakeLists.txt | 8 ++++---- INSTALL.md | 2 +- SConstruct | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e7ce49d433b1..cf8066780819 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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) @@ -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) diff --git a/INSTALL.md b/INSTALL.md index cd4184ba21c6..4c6c0747a592 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -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 diff --git a/SConstruct b/SConstruct index c18d9e053f85..f12fbe1a8956 100755 --- a/SConstruct +++ b/SConstruct @@ -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.