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

allow compilation of ogrindex and ogr plugin on mac osx

Browse source
This commit is contained in:
Dane Springmeyer 2009-05-12 04:32:42 +00:00
parent ebe9cc1bfe
commit 31d6475655
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/input/ogr/SConscript
View file

@ -34,12 +34,16 @@ ogr_src = Split(
)
libraries = [env['PLUGINS']['ogr']['lib']]
if env['PLATFORM'] == 'Darwin':
if env['BOOST_SYSTEM_REQUIRED']:
boost_system = 'boost_system%s' % env['BOOST_APPEND']
libraries.append(boost_system)
libraries.append('mapnik')
libraries.append('icuuc')
libraries.append('icudata')
libraries.append('boost_system%s' % env['BOOST_APPEND'])
libraries.append('boost_filesystem%s' % env['BOOST_APPEND'])
libraries.append('boost_iostreams%s' % env['BOOST_APPEND'])
ogr_inputdriver = env.SharedLibrary('ogr', source=ogr_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)

2
plugins/input/ogr/ogr_datasource.cpp
View file

@ -120,7 +120,7 @@ ogr_datasource::ogr_datasource(parameters const& params)
extent_.init (envelope.MinX, envelope.MinY, envelope.MaxX, envelope.MaxY);
// scan for index file
int breakpoint = dataset_name_.find_last_of (".");
unsigned breakpoint = dataset_name_.find_last_of (".");
if (breakpoint == std::string::npos) breakpoint = dataset_name_.length();
index_name_ = dataset_name_.substr(0, breakpoint) + ".index";
std::ifstream index_file (index_name_.c_str(), std::ios::in | std::ios::binary);

9
utils/ogrindex/SConscript
View file

@ -39,9 +39,12 @@ boost_iostreams = 'boost_iostreams%s' % env['BOOST_APPEND']
boost_filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
libraries = [boost_program_options,boost_iostreams,boost_filesystem,env['PLUGINS']['ogr']['lib'],'mapnik']
if env['PLATFORM'] == 'Darwin' and env['BOOST_SYSTEM_REQUIRED']:
boost_system = 'boost_system%s' % env['BOOST_APPEND']
libraries.append(boost_system)
if env['PLATFORM'] == 'Darwin':
if env['BOOST_SYSTEM_REQUIRED']:
boost_system = 'boost_system%s' % env['BOOST_APPEND']
libraries.append(boost_system)
libraries.append('icuuc')
libraries.append('icudata')
ogrindex = env.Program('ogrindex', source, CPPPATH=headers, LIBS=libraries)

2
utils/ogrindex/ogrindex.cpp
View file

@ -129,7 +129,7 @@ int main (int argc,char** argv)
continue;
}
int breakpoint = ogrname.find_last_of (".");
unsigned breakpoint = ogrname.find_last_of (".");
if (breakpoint == string::npos) breakpoint = ogrname.length();
std::string ogrlayername (ogrname.substr(0, breakpoint));