From 361a78c4782a9bd329f2fe660dac5d4fd6c062cc Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Tue, 29 Apr 2014 09:24:18 +0200 Subject: [PATCH] Scons: check for C++11 specific headers. Be more explicit w/r boost we still don't check for the precise boost version number in the SCons configuration. We might do so in future, but for now our policy is that precise version dependency checking is the business of the packager (i.e. the debian package). The SCons build just has to ensure the absolute necessary baseline --- admin/scons/Platform.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/admin/scons/Platform.py b/admin/scons/Platform.py index 1ce12662c..3614e2561 100644 --- a/admin/scons/Platform.py +++ b/admin/scons/Platform.py @@ -73,12 +73,19 @@ def configure(env): else: conf.env.mergeConf('nobugmt') - if not conf.CheckCXXHeader('tr1/memory'): - problems.append('We rely on the std::tr1 standard C++ extension for shared_ptr.') + if not conf.CheckCXXHeader('memory'): + problems.append('We rely on the C++11 smart-pointers.') + + if not conf.CheckCXXHeader('functional'): + problems.append('We rely on the C++11 functor objects.') if not conf.CheckCXXHeader('boost/config.hpp'): problems.append('We need the C++ boost-libraries.') else: + if not conf.CheckCXXHeader('boost/noncopyable.hpp'): + problems.append('We need boost::noncopyable') + if not conf.CheckCXXHeader('boost/lexical_cast.hpp'): + problems.append('We need boost::lexical_cast') if not conf.CheckCXXHeader('boost/scoped_ptr.hpp'): problems.append('We need boost::scoped_ptr (scoped_ptr.hpp).') if not conf.CheckCXXHeader('boost/format.hpp'):