F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: (fixes #3007) Boost library configuration in contrib

Browse Source
This commit is contained in:
Ryan Mast
2018-12-06 17:43:16 -08:00
parent 86b4631a32
commit 9125acbb1c
3 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wscript
View File

@@ -457,6 +457,19 @@ def configure(conf):
else:
Logs.warn("CXX Standard flag " + Options.options.cxx_standard + " was not recognized, using compiler's default")
# Find Boost libraries by modules
conf.env['REQUIRED_BOOST_LIBS'] = []
for modules_dir in ['src', 'contrib']:
conf.recurse (modules_dir, name="get_required_boost_libs", mandatory=False)
if conf.env['REQUIRED_BOOST_LIBS'] is not []:
conf.load('boost')
conf.check_boost(lib=' '.join (conf.env['REQUIRED_BOOST_LIBS']), mandatory=False)
if not conf.env['LIB_BOOST']:
conf.check_boost(lib=' '.join (conf.env['REQUIRED_BOOST_LIBS']), libpath="/usr/lib64", mandatory=False)
if not conf.env['LIB_BOOST']:
conf.env['LIB_BOOST'] = []
# Set this so that the lists won't be printed at the end of this
# configure command.
conf.env['PRINT_BUILT_MODULES_AT_END'] = False