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

link libmapnik and boost system to help avoid any linking errors with more recent boost - closes #1567

Browse source
This commit is contained in:
Dane Springmeyer 2012-11-08 15:07:50 -05:00
parent 1c74e61249
commit 5c0c072b21
11 changed files with 42 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -16,8 +16,6 @@
# License along with this library; if not, write to the Free Software # License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
# $Id$
import os import os
import sys import sys

3
bindings/python/SConscript
View file

@ -31,6 +31,9 @@ install_prefix = env['DESTDIR'] + '/' + prefix
linkflags = '' linkflags = ''
libraries = ['mapnik','png','jpeg'] libraries = ['mapnik','png','jpeg']
if env['HAS_BOOST_SYSTEM']:
libraries.append('boost_system%s' % env['BOOST_APPEND'])
if env['BOOST_PYTHON_LIB']: if env['BOOST_PYTHON_LIB']:
libraries.append(env['BOOST_PYTHON_LIB']) libraries.append(env['BOOST_PYTHON_LIB'])
else: else:

7
plugins/input/gdal/SConscript
View file

@ -32,9 +32,10 @@ gdal_src = Split(
) )
libraries = [env['PLUGINS']['gdal']['lib']] libraries = [env['PLUGINS']['gdal']['lib']]
if env['PLATFORM'] == 'Darwin': libraries.append('mapnik')
libraries.append('mapnik') libraries.append(env['ICU_LIB_NAME'])
libraries.append(env['ICU_LIB_NAME']) if env['HAS_BOOST_SYSTEM']:
libraries.append('boost_system%s' % env['BOOST_APPEND'])
gdal_inputdriver = env.SharedLibrary('gdal', source=gdal_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) gdal_inputdriver = env.SharedLibrary('gdal', source=gdal_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

9
plugins/input/kismet/SConscript
View file

@ -32,10 +32,11 @@ kismet_src = Split(
) )
libraries = [] libraries = []
if env['PLATFORM'] == 'Darwin': libraries.append('mapnik')
libraries.append('mapnik') libraries.append(env['ICU_LIB_NAME'])
libraries.append(env['ICU_LIB_NAME']) libraries.append('boost_thread%s' % env['BOOST_APPEND'])
libraries.append('boost_thread%s' % env['BOOST_APPEND']) if env['HAS_BOOST_SYSTEM']:
libraries.append('boost_system%s' % env['BOOST_APPEND'])
kismet_inputdriver = env.SharedLibrary('../kismet', source=kismet_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) kismet_inputdriver = env.SharedLibrary('../kismet', source=kismet_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

7
plugins/input/occi/SConscript
View file

@ -35,9 +35,10 @@ occi_src = Split(
) )
libraries = [ 'occi', 'ociei' ] libraries = [ 'occi', 'ociei' ]
if env['PLATFORM'] == 'Darwin': libraries.append('mapnik')
libraries.append('mapnik') libraries.append(env['ICU_LIB_NAME'])
libraries.append(env['ICU_LIB_NAME']) if env['HAS_BOOST_SYSTEM']:
libraries.append('boost_system%s' % env['BOOST_APPEND'])
occi_inputdriver = env.SharedLibrary('../occi', source=occi_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) occi_inputdriver = env.SharedLibrary('../occi', source=occi_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

11
plugins/input/ogr/SConscript
View file

@ -35,13 +35,10 @@ ogr_src = Split(
libraries = [env['PLUGINS']['ogr']['lib']] libraries = [env['PLUGINS']['ogr']['lib']]
libraries.append(['boost_iostreams%s' % env['BOOST_APPEND']]) libraries.append(['boost_iostreams%s' % env['BOOST_APPEND']])
if env['HAS_BOOST_SYSTEM']:
if env['PLATFORM'] == 'Darwin': libraries.append('boost_system%s' % env['BOOST_APPEND'])
if env['HAS_BOOST_SYSTEM']: libraries.append('mapnik')
boost_system = 'boost_system%s' % env['BOOST_APPEND'] libraries.append(env['ICU_LIB_NAME'])
libraries.append(boost_system)
libraries.append('mapnik')
libraries.append(env['ICU_LIB_NAME'])
ogr_inputdriver = env.SharedLibrary('../ogr', source=ogr_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) ogr_inputdriver = env.SharedLibrary('../ogr', source=ogr_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

7
plugins/input/osm/SConscript
View file

@ -37,9 +37,10 @@ osm_src = Split(
libraries = [ 'xml2' ] libraries = [ 'xml2' ]
libraries.append('curl') libraries.append('curl')
if env['PLATFORM'] == 'Darwin': libraries.append('mapnik')
libraries.append('mapnik') libraries.append(env['ICU_LIB_NAME'])
libraries.append(env['ICU_LIB_NAME']) if env['HAS_BOOST_SYSTEM']:
libraries.append('boost_system%s' % env['BOOST_APPEND'])
osm_inputdriver = env.SharedLibrary('../osm', source=osm_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) osm_inputdriver = env.SharedLibrary('../osm', source=osm_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

11
plugins/input/postgis/SConscript
View file

@ -33,11 +33,12 @@ postgis_src = Split(
libraries = ['pq'] libraries = ['pq']
if env['PLATFORM'] == 'Darwin': libraries.append('mapnik')
libraries.append('mapnik') libraries.append(env['ICU_LIB_NAME'])
libraries.append(env['ICU_LIB_NAME']) if env['THREADING'] == 'multi':
if env['THREADING'] == 'multi': libraries.append('boost_thread%s' % env['BOOST_APPEND'])
libraries.append('boost_thread%s' % env['BOOST_APPEND']) if env['HAS_BOOST_SYSTEM']:
libraries.append('boost_system%s' % env['BOOST_APPEND'])
postgis_inputdriver = env.SharedLibrary('../postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) postgis_inputdriver = env.SharedLibrary('../postgis', source=postgis_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

8
plugins/input/raster/SConscript
View file

@ -33,11 +33,11 @@ raster_src = Split(
) )
libraries = [] libraries = []
if env['PLATFORM'] == 'Darwin': libraries.append('mapnik')
libraries.append('mapnik') libraries.append(env['ICU_LIB_NAME'])
libraries.append(env['ICU_LIB_NAME']) if env['HAS_BOOST_SYSTEM']:
libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND'])
raster_inputdriver = env.SharedLibrary('../raster', source=raster_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) raster_inputdriver = env.SharedLibrary('../raster', source=raster_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

9
plugins/input/shape/SConscript
View file

@ -37,12 +37,11 @@ shape_src = Split(
) )
libraries = ['boost_iostreams%s' % env['BOOST_APPEND']] libraries = ['boost_iostreams%s' % env['BOOST_APPEND']]
libraries.append('mapnik')
if env['PLATFORM'] == 'Darwin': libraries.append(env['ICU_LIB_NAME'])
libraries.append('mapnik') if env['HAS_BOOST_SYSTEM']:
libraries.append(env['ICU_LIB_NAME'])
libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND'])
env2 = env.Clone() env2 = env.Clone()
if env['SHAPE_MEMORY_MAPPED_FILE']: if env['SHAPE_MEMORY_MAPPED_FILE']:

8
plugins/input/sqlite/SConscript
View file

@ -32,11 +32,11 @@ sqlite_src = Split(
) )
libraries = [ 'sqlite3' ] libraries = [ 'sqlite3' ]
if env['PLATFORM'] == 'Darwin': libraries.append('mapnik')
libraries.append('mapnik') libraries.append(env['ICU_LIB_NAME'])
libraries.append(env['ICU_LIB_NAME']) if env['HAS_BOOST_SYSTEM']:
libraries.append('boost_system%s' % env['BOOST_APPEND']) libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append('boost_filesystem%s' % env['BOOST_APPEND']) libraries.append('boost_filesystem%s' % env['BOOST_APPEND'])
sqlite_inputdriver = env.SharedLibrary('../sqlite', source=sqlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries) sqlite_inputdriver = env.SharedLibrary('../sqlite', source=sqlite_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)