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

mapnik-config: minor cleanup

Browse source
This commit is contained in:
Mickey Rose 2019-09-16 23:30:01 +02:00
parent a3086c06a5
commit 2dcb31cd01
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
utils/mapnik-config/build.py
View file

@ -87,22 +87,17 @@ template_env['CXX'] = re.sub(r'^ccache +', '', cxx_cleaned)
template_env['DEFINES'] = ' '.join(config_env['LIBMAPNIK_DEFINES']) template_env['DEFINES'] = ' '.join(config_env['LIBMAPNIK_DEFINES'])
dep_includes = ''.join([' -I%s' % i for i in config_env['CPPPATH'] if not i.startswith('#')]) dep_includes = ['-I%s' % i for i in config_env['CPPPATH'] if not i.startswith('#')]
dep_includes += ' '
if config_env['HAS_CAIRO']: if config_env['HAS_CAIRO']:
dep_includes += ''.join([' -I%s' % i for i in env['CAIRO_CPPPATHS'] if not i.startswith('#')]) dep_includes += ['-I%s' % i for i in env['CAIRO_CPPPATHS'] if not i.startswith('#')]
template_env['DEP_INCLUDES'] = dep_includes template_env['DEP_INCLUDES'] = ' '.join(dep_includes)
ldflags = ''.join([' -L%s' % i for i in config_env['LIBPATH'] if not i.startswith('#')]) ldflags = ' '.join('-L%s' % i for i in config_env['LIBPATH'] if not i.startswith('#'))
ldflags += config_env['LIBMAPNIK_LINKFLAGS'] ldflags += config_env['LIBMAPNIK_LINKFLAGS']
template_env['LDFLAGS'] = ldflags template_env['LDFLAGS'] = ldflags
dep_libs = ''.join([' -l%s' % i for i in env['LIBMAPNIK_LIBS']])
# remove local agg from public linking # remove local agg from public linking
dep_libs = dep_libs.replace('-lagg','') dep_libs = ' '.join('-l%s' % i for i in env['LIBMAPNIK_LIBS'] if i != 'agg')
template_env['DEP_LIBS'] = dep_libs template_env['DEP_LIBS'] = dep_libs
try: try: