sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

restore compilation to shapeindex on mac os x after r1113

Browse source
This commit is contained in:
Dane Springmeyer 2009-04-29 00:06:10 +00:00
parent eaa49ca028
commit 618fa0d2c0
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
SConstruct
View file

@ -196,6 +196,7 @@ pickle_store = [# Scons internal variables
'PYTHON_INCLUDES', 'PYTHON_INCLUDES',
'PYTHON_INSTALL_LOCATION', 'PYTHON_INSTALL_LOCATION',
'COLOR_PRINT', 'COLOR_PRINT',
'BOOST_SYSTEM_REQUIRED',
] ]
# Add all other user configurable options to pickle pickle_store # 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]) boost_version_from_header = int(boost_lib_version_from_header.split('_')[1])
if boost_version_from_header >= 35 and env['PLATFORM'] == 'Darwin': if boost_version_from_header >= 35 and env['PLATFORM'] == 'Darwin':
boost_system_required = True boost_system_required = True
env['BOOST_SYSTEM_REQUIRED'] = True
else: else:
boost_system_required = False boost_system_required = False
env['BOOST_SYSTEM_REQUIRED'] = False
# The other required boost headers. # The other required boost headers.
BOOST_LIBSHEADERS = [ BOOST_LIBSHEADERS = [

5
utils/shapeindex/SConscript
View file

@ -41,6 +41,11 @@ boost_iostreams = 'boost_iostreams%s' % env['BOOST_APPEND']
boost_filesystem = 'boost_filesystem%s' % env['BOOST_APPEND'] boost_filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
libraries = [boost_program_options,boost_iostreams,boost_filesystem] 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) shapeindex = env.Program('shapeindex', source, CPPPATH=headers, LIBS=libraries)
env.Install(install_prefix + '/bin', shapeindex) env.Install(install_prefix + '/bin', shapeindex)