Merge pull request #3175 from mapycz/fix-link-mapnik-index

mapnik-index: fix linking on Linux
This commit is contained in:
Artem Pavlenko 2015-11-19 12:38:02 +00:00
commit 4dd2202055

View file

@ -42,9 +42,9 @@ boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND']
boost_system = 'boost_system%s' % env['BOOST_APPEND'] boost_system = 'boost_system%s' % env['BOOST_APPEND']
libraries = [env['MAPNIK_NAME'], boost_program_options, boost_system] libraries = [env['MAPNIK_NAME'], boost_program_options, boost_system]
# need on linux: https://github.com/mapnik/mapnik/issues/3145 # need on linux: https://github.com/mapnik/mapnik/issues/3145
libraries.append(env['ICU_LIB_NAME'])
libraries.append('mapnik-json') libraries.append('mapnik-json')
libraries.append('mapnik-wkt') libraries.append('mapnik-wkt')
libraries.append(env['ICU_LIB_NAME'])
if env['RUNTIME_LINK'] == 'static': if env['RUNTIME_LINK'] == 'static':
libraries.extend(copy(env['LIBMAPNIK_LIBS'])) libraries.extend(copy(env['LIBMAPNIK_LIBS']))