From c69db365db40ebd4c4d75cd894f28052cec86ada Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 23 Apr 2012 15:22:04 -0400 Subject: [PATCH] scons: pass proper CXXFLAGS to svg2png build --- utils/svg2png/build.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/utils/svg2png/build.py b/utils/svg2png/build.py index c7f428b88..49ac1b070 100644 --- a/utils/svg2png/build.py +++ b/utils/svg2png/build.py @@ -33,13 +33,17 @@ source = Split( """ ) -headers = 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') libraries = copy(env['LIBMAPNIK_LIBS']) boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND'] libraries.extend([boost_program_options,'mapnik']) -svg2png = program_env.Program('svg2png', source, CPPPATH=headers, LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) +svg2png = program_env.Program('svg2png', source, LIBS=libraries, LINKFLAGS=env['CUSTOM_LDFLAGS']) Depends(svg2png, env.subst('../../src/%s' % env['MAPNIK_LIB_NAME']))