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

scons: make sure to handle adding custom flags onto mapnik_python.cpp compile *even* if we do not know the SVN_REVISION

Browse source
This commit is contained in:
Dane Springmeyer 2011-01-13 20:53:18 +00:00
parent 2de2edc171
commit 0d310d5ba3
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bindings/python/SConscript
View file

@ -184,7 +184,7 @@ if env['SVN_REVISION']:
env2.Append(CXXFLAGS='-DSVN_REVISION=%s' % env['SVN_REVISION'])
if env['HAS_CAIRO'] or env['HAS_PYCAIRO']:
if env['HAS_CAIRO']:
env2.ParseConfig('pkg-config --libs --cflags cairomm-1.0')
env2.ParseConfig('pkg-config --cflags cairomm-1.0')
env2.Append(CXXFLAGS = '-DHAVE_CAIRO')
if env['HAS_PYCAIRO']:
env2.ParseConfig('pkg-config --cflags pycairo')
@ -196,6 +196,8 @@ if env['HAS_CAIRO'] or env['HAS_PYCAIRO']:
py_env.ParseConfig('pkg-config --libs cairomm-1.0')
env2 = py_env.Clone()
fixup = ['mapnik_image.cpp','python_cairo.cpp']
if not env['SVN_REVISION']:
fixup.append('mapnik_python.cpp')
for cpp in fixup:
if cpp in sources:
sources.remove(cpp)