From 915cc0a26585f2d57447b38a82500823e28bec3d Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 18 Mar 2010 20:44:53 +0000 Subject: [PATCH] scons: fixup logic for setting HAS_BOOST_SYSTEM SCons environment variable --- SConstruct | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/SConstruct b/SConstruct index 6b795b0bb..5a947291a 100644 --- a/SConstruct +++ b/SConstruct @@ -820,20 +820,17 @@ if not preconfigured: conf.FindBoost(BOOST_SEARCH_PREFIXES,thread_flag) # 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() if boost_lib_version_from_header: boost_version_from_header = int(boost_lib_version_from_header.split('_')[1]) if boost_version_from_header >= 35: - has_boost_system = True env['HAS_BOOST_SYSTEM'] = True - else: - has_boost_system = False - env['HAS_BOOST_SYSTEM'] = False + # The other required boost headers. 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], ['regex', 'boost/regex.hpp', True], ['iostreams','boost/iostreams/device/mapped_file.hpp',True],