From 4b57ee3d4c3f2b9a7359efa4f70a1fedc4c4027c Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Sat, 22 Oct 2016 16:26:20 -0400 Subject: [PATCH] [SCons/Doc] Formalize dependency on Boost --- SConstruct | 4 ++++ doc/sphinx/compiling.rst | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index ca00b2669..1106fc078 100644 --- a/SConstruct +++ b/SConstruct @@ -837,6 +837,10 @@ env['HAS_LIBCPP'] = conf.CheckDeclaration('_LIBCPP_VERSION', '#include '], 'BOOST_LIB_VERSION') retcode, boost_lib_version = conf.TryRun(boost_version_source, '.cpp') env['BOOST_LIB_VERSION'] = boost_lib_version.strip() +print 'INFO: Found Boost version {0!r}'.format(env['BOOST_LIB_VERSION']) +if not env['BOOST_LIB_VERSION']: + config_error("Boost could not be found. Install Boost headers or set" + " 'boost_inc_dir' to point to the boost headers.") import SCons.Conftest, SCons.SConf context = SCons.SConf.CheckContext(conf) diff --git a/doc/sphinx/compiling.rst b/doc/sphinx/compiling.rst index a9b613f5e..3d74cce7e 100644 --- a/doc/sphinx/compiling.rst +++ b/doc/sphinx/compiling.rst @@ -34,7 +34,7 @@ Linux * For Ubuntu or Debian users, the following packages should be installed using your choice of package manager:: - g++ python scons libsundials-serial-dev + g++ python scons libsundials-serial-dev libboost-dev * Building the python module also requires:: @@ -47,7 +47,7 @@ Linux * For Fedora (version 22 or higher) users, the following packages should be installed via the package manager:: - gcc-c++ python scons sundials-devel blas-devel lapack-devel + gcc-c++ python scons sundials-devel blas-devel lapack-devel boost-devel If your Fedora version is lower than 22, the `sundials-devel` package is not available, and you should build Sundials from source.