archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

- fixed OGR input plugin problem when using boost mapped_file (needs linkage to libboost_iostreams.so)

Browse Source 
- cosmetics
This commit is contained in:
Lucio Asnaghi 2010-06-17 10:38:23 +00:00
parent 3e2a82ed16
commit d4a334341e
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/input/ogr/SConscript
View File

@ -19,6 +19,7 @@
#
# $Id$
Import ('env')
prefix = env['PREFIX']
@ -26,22 +27,21 @@ install_prefix = env['DESTDIR'] + '/' + prefix
ogr_src = Split(
"""
ogr_converter.cpp
ogr_datasource.cpp
ogr_featureset.cpp
ogr_index_featureset.cpp
ogr_converter.cpp
ogr_datasource.cpp
ogr_featureset.cpp
ogr_index_featureset.cpp
"""
)
libraries = [env['PLUGINS']['ogr']['lib']]
libraries = ['boost_iostreams%s' % env['BOOST_APPEND']]
if env['PLATFORM'] == 'Darwin':
if env['HAS_BOOST_SYSTEM']:
boost_system = 'boost_system%s' % env['BOOST_APPEND']
libraries.append(boost_system)
libraries.append('mapnik2')
libraries.append(env['ICU_LIB_NAME'])
libraries.append('boost_iostreams%s' % env['BOOST_APPEND'])
libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append('boost_filesystem%s' % env['BOOST_APPEND'])
ogr_inputdriver = env.SharedLibrary('ogr', source=ogr_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

3
plugins/input/ogr/ogr_datasource.cpp
View File

@ -80,8 +80,7 @@ ogr_datasource::ogr_datasource(parameters const& params)
if (!dataset_)
{
std::string err = CPLGetLastErrorMsg();
if( err.size() == 0 )
{
if( err.size() == 0 ) {
throw datasource_exception("Connection failed: " + dataset_name_ + " was not found or is not a supported format");
} else {
throw datasource_exception(err);