0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

On Boost: update build scripts and documentation.

Browse source 
At branch 'doc-from-discord-boost-discussion-20170926'.

The build documentation and scripts were slightly out of date about
Boost. This commit makes a (probably interim) update to them.

(CMakeLists.txt|SConstruct): `wesnoth` won't build using Boost earlier
than '1.50.0'. Boost 1.50.0 changed the location of version 3 of Boost
filesystem, from 'boost/filesystem/v3/' (e.g. for
'using boost::filesystem::v3::path;') to 'boost/filesystem/' (e.g. for
'using boost::filesystem::path;', enforced since the very introduction
of 'src/filesystem_boost.cpp'), making it incompatible unless using
precompiler directives for supporting backwards versions of Boost
filesystem prior than '1.50.0'. Using Boost 1.50.0 (and 51, 52 etc.)
`wesnoth` is able build and run. I checked using `ldd` that I am right
about the run time environment.

INSTALL.md: Requirement of Boost libraries version up to date.

projectfiles/VC12/README.md: Requirement of Boost libraries up to
date, only the statement of which one is the minimum version, not the
rest of the build guide for Boost as requirement.

.gitignore: Add KDevelop backup documents.
This commit is contained in:
galegosimpatico 2017-09-26 18:00:08 +00:00 • committed by Jyrki Vesterinen
parent 5d896eb6ba
commit 8b0d7e6799
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -70,6 +70,9 @@ src/**/*.vcproj
!utils/umc_dev/org.wesnoth*/.settings/
!utils/umc_dev/org.wesnoth*/.project
# KDevelop caches (KDevelop 4.3.1, KDE Development Platform 4.8.4).
*.kate-swp
# autotools
config.h
config.h.in

6
CMakeLists.txt
View file

@ -75,7 +75,7 @@ else()
endif()
find_package(Crypto 1.0 REQUIRED)
find_package(Boost 1.48 REQUIRED COMPONENTS iostreams program_options regex system thread random)
find_package(Boost 1.50 REQUIRED COMPONENTS iostreams program_options regex system thread random)
# no, gettext executables are not required when NLS is deactivated
find_package(Gettext)
@ -692,9 +692,9 @@ if(ENABLE_GAME)
endif(ENABLE_GAME)
if(ENABLE_GAME OR ENABLE_SERVER OR ENABLE_TOOLS OR ENABLE_TESTS)
find_package( Boost 1.48 REQUIRED COMPONENTS filesystem )
find_package(Boost 1.50 REQUIRED COMPONENTS filesystem)
find_package( Boost 1.48 REQUIRED COMPONENTS locale )
find_package(Boost 1.50 REQUIRED COMPONENTS locale)
endif(ENABLE_GAME OR ENABLE_SERVER OR ENABLE_TOOLS OR ENABLE_TESTS)
if(ENABLE_POT_UPDATE_TARGET)

2
INSTALL.md
View file

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

2
SConstruct
View file

@ -183,7 +183,7 @@ if 'TRAVIS' in os.environ:
else:
SDL2_version = '2.0.4'
boost_version = '1.48.0'
boost_version = '1.50.0'
Help("""Arguments may be a mixture of switches and targets in any order.

5
projectfiles/VC12/README.md
View file

@ -82,7 +82,10 @@ folders, all version numbers are minimal requirements:
into the 'lib' *General Folder*.
3. libboost-1.48.0 ( http://www.boost.org/ )
3. libboost-1.50.0 ( http://www.boost.org/ )
Note these instructions are still referring to Boost 1.48.0, and are so
pending possible fixes to make it Boost >= 1.50.0 compliant.
Download Boost and unpack it into the folder
`C:\projects\`