X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Fsite_tools%2FBoost.py;fp=site_scons%2Fsite_tools%2FBoost.py;h=202ed96dbb996a59a8f8735be3ccbc8ac3c303a6;hb=f08685d9795a3be20ce5c7a337087358ccd77eb5;hp=d040b78b1ddc63748d739887801f3e1e0599e818;hpb=731487d5f44eaa8c07a21de1dfa00cea2150c80e;p=senf.git diff --git a/site_scons/site_tools/Boost.py b/site_scons/site_tools/Boost.py index d040b78..202ed96 100644 --- a/site_scons/site_tools/Boost.py +++ b/site_scons/site_tools/Boost.py @@ -198,8 +198,10 @@ def CheckBoostVariants(context, *variants): print "Using %s boost variant." % ( useVariant and "'%s'" % useVariant or "default") context.env.Replace( BOOST_VARIANT = useVariant ) + context.env.Append( HAS_BOOST_SYSTEM = context.sconf.CheckLib('boost_system', language='c++', autoadd=False)) return useVariant + def generate(env): env.SetDefault( BOOST_VARIANT = None, @@ -210,6 +212,9 @@ def generate(env): BOOSTFSLIB = 'boost_filesystem$_BOOST_VARIANT', BOOSTIOSTREAMSLIB = 'boost_iostreams$_BOOST_VARIANT', BOOSTSIGNALSLIB = 'boost_signals$_BOOST_VARIANT', + + _BOOSTSYSTEMLIB = '${HAS_BOOST_SYSTEM and "boost_system" or ""}', + BOOSTSYSTEMLIB = '$_BOOSTSYSTEMLIB', BOOSTTESTARGS = [ '--build_info=yes', '--log_level=test_suite' ], )