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

scons: maintain cairo/cairomm cflags in 'mapnik config --cflags' output

Browse source
This commit is contained in:
Dane Springmeyer 2011-08-30 05:17:50 +00:00
parent 2abe4d8960
commit ba03f91d26
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
demo/c++/SConscript
View file

@ -36,7 +36,7 @@ demo_env = env.Clone()
demo_env['CXXFLAGS'] = copy(env['LIBMAPNIK_CXXFLAGS'])
if env['HAS_CAIRO']:
demo_env.PrependUnique(CPPPATH=copy(env['CAIROMM_CPPPATHS']))
demo_env.PrependUnique(CPPPATH=env['CAIROMM_CPPPATHS'])
demo_env.Append(CXXFLAGS = '-DHAVE_CAIRO')
libraries = copy(env['LIBMAPNIK_LIBS'])

3
utils/mapnik-config/SConscript
View file

@ -57,6 +57,9 @@ other_includes = ''.join([' -I%s' % i for i in config_env['CPPPATH'] if not i.st
other_includes += ' '.join(config_env['LIBMAPNIK_CXXFLAGS'])
if config_env['HAS_CAIRO']:
other_includes += ''.join([' -I%s' % i for i in env['CAIROMM_CPPPATHS'] if not i.startswith('#')])
ldflags = config_env['CUSTOM_LDFLAGS'] + ''.join([' -L%s' % i for i in config_env['LIBPATH'] if not i.startswith('#')])
dep_libs = ''.join([' -l%s' % i for i in env['LIBMAPNIK_LIBS']])