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

scons: fixup pgsql2pqlite build by ensuring CXXFLAGS are passed

Browse source
This commit is contained in:
Dane Springmeyer 2012-04-23 12:48:30 -07:00
parent c69db365db
commit f8c58c22c6
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
utils/pgsql2sqlite/build.py
View file

@ -35,8 +35,13 @@ source = Split(
""" """
) )
headers = ['#plugins/input/postgis'] + env['CPPPATH'] program_env['CXXFLAGS'] = copy(env['LIBMAPNIK_CXXFLAGS'])
if env['HAS_CAIRO']:
program_env.PrependUnique(CPPPATH=env['CAIROMM_CPPPATHS'])
program_env.Append(CXXFLAGS = '-DHAVE_CAIRO')
program_env.PrependUnique(CPPPATH=['#plugins/input/postgis'])
libraries = [] libraries = []
boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND'] boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND']
@ -49,7 +54,7 @@ if env['SQLITE_LINKFLAGS']:
if env['RUNTIME_LINK'] == 'static': if env['RUNTIME_LINK'] == 'static':
libraries.extend(['ldap','pam','ssl','crypto','krb5']) libraries.extend(['ldap','pam','ssl','crypto','krb5'])
pgsql2sqlite = program_env.Program('pgsql2sqlite', source, CPPPATH=headers, LIBS=libraries, LINKFLAGS=linkflags) pgsql2sqlite = program_env.Program('pgsql2sqlite', source, LIBS=libraries, LINKFLAGS=linkflags)
Depends(pgsql2sqlite, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME'])) Depends(pgsql2sqlite, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))
if 'uninstall' not in COMMAND_LINE_TARGETS: if 'uninstall' not in COMMAND_LINE_TARGETS: