sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scons: fixup logic for setting HAS_BOOST_SYSTEM SCons environment variable

Browse source
This commit is contained in:
Dane Springmeyer 2010-03-18 20:44:53 +00:00
parent be9f874bbc
commit 915cc0a265
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SConstruct
View file

@ -820,20 +820,17 @@ if not preconfigured:
conf.FindBoost(BOOST_SEARCH_PREFIXES,thread_flag) conf.FindBoost(BOOST_SEARCH_PREFIXES,thread_flag)
# boost system is used in boost 1.35 and greater # boost system is used in boost 1.35 and greater
has_boost_system = False env['HAS_BOOST_SYSTEM'] = False
boost_lib_version_from_header = conf.GetBoostLibVersion() boost_lib_version_from_header = conf.GetBoostLibVersion()
if boost_lib_version_from_header: if boost_lib_version_from_header:
boost_version_from_header = int(boost_lib_version_from_header.split('_')[1]) boost_version_from_header = int(boost_lib_version_from_header.split('_')[1])
if boost_version_from_header >= 35: if boost_version_from_header >= 35:
has_boost_system = True
env['HAS_BOOST_SYSTEM'] = True env['HAS_BOOST_SYSTEM'] = True
else:
has_boost_system = False
env['HAS_BOOST_SYSTEM'] = False
# The other required boost headers. # The other required boost headers.
BOOST_LIBSHEADERS = [ BOOST_LIBSHEADERS = [
['system', 'boost/system/system_error.hpp', has_boost_system], ['system', 'boost/system/system_error.hpp', env['HAS_BOOST_SYSTEM']],
['filesystem', 'boost/filesystem/operations.hpp', True], ['filesystem', 'boost/filesystem/operations.hpp', True],
['regex', 'boost/regex.hpp', True], ['regex', 'boost/regex.hpp', True],
['iostreams','boost/iostreams/device/mapped_file.hpp',True], ['iostreams','boost/iostreams/device/mapped_file.hpp',True],