diff --git a/SConstruct b/SConstruct index 9abbb66a0..052bb3a13 100644 --- a/SConstruct +++ b/SConstruct @@ -196,6 +196,7 @@ pickle_store = [# Scons internal variables 'PYTHON_INCLUDES', 'PYTHON_INSTALL_LOCATION', 'COLOR_PRINT', + 'BOOST_SYSTEM_REQUIRED', ] # Add all other user configurable options to pickle pickle_store @@ -571,8 +572,10 @@ if not preconfigured: boost_version_from_header = int(boost_lib_version_from_header.split('_')[1]) if boost_version_from_header >= 35 and env['PLATFORM'] == 'Darwin': boost_system_required = True + env['BOOST_SYSTEM_REQUIRED'] = True else: boost_system_required = False + env['BOOST_SYSTEM_REQUIRED'] = False # The other required boost headers. BOOST_LIBSHEADERS = [ diff --git a/utils/shapeindex/SConscript b/utils/shapeindex/SConscript index 93e287438..e5ed5f181 100644 --- a/utils/shapeindex/SConscript +++ b/utils/shapeindex/SConscript @@ -41,6 +41,11 @@ boost_iostreams = 'boost_iostreams%s' % env['BOOST_APPEND'] boost_filesystem = 'boost_filesystem%s' % env['BOOST_APPEND'] libraries = [boost_program_options,boost_iostreams,boost_filesystem] +if env['PLATFORM'] == 'Darwin' and env['BOOST_SYSTEM_REQUIRED']: + boost_system = 'boost_system%s' % env['BOOST_APPEND'] + libraries.append(boost_system) + + shapeindex = env.Program('shapeindex', source, CPPPATH=headers, LIBS=libraries) env.Install(install_prefix + '/bin', shapeindex)