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

make sure to install svg and wkt include files - thanks kiorky for initial patch - closes #718

Browse source
This commit is contained in:
Dane Springmeyer 2011-02-25 21:00:05 +00:00
parent 545960a340
commit 03ee4570be
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/SConscript
View file

@ -288,8 +288,18 @@ else:
env['create_uninstall_target'](env, os.path.join(target_path,mapnik_libname)) env['create_uninstall_target'](env, os.path.join(target_path,mapnik_libname))
includes = glob.glob('../include/mapnik/*.hpp') includes = glob.glob('../include/mapnik/*.hpp')
svg_includes = glob.glob('../include/mapnik/svg/*.hpp')
wkt_includes = glob.glob('../include/mapnik/wkt/*.hpp')
inc_target = os.path.normpath(install_prefix+'/include/mapnik') inc_target = os.path.normpath(install_prefix+'/include/mapnik')
svg_inc_target = os.path.normpath(install_prefix+'/include/mapnik/svg')
wkt_inc_target = os.path.normpath(install_prefix+'/include/mapnik/wkt')
if 'uninstall' not in COMMAND_LINE_TARGETS: if 'uninstall' not in COMMAND_LINE_TARGETS:
env.Alias(target='install', source=env.Install(inc_target, includes)) env.Alias(target='install', source=env.Install(inc_target, includes))
env.Alias(target='install', source=env.Install(svg_inc_target, svg_includes))
env.Alias(target='install', source=env.Install(wkt_inc_target, wkt_includes))
env['create_uninstall_target'](env, inc_target) env['create_uninstall_target'](env, inc_target)
env['create_uninstall_target'](env, svg_inc_target)
env['create_uninstall_target'](env, wkt_inc_target)

10
src/marker_cache.cpp
View file

@ -99,8 +99,8 @@ boost::optional<marker_ptr> marker_cache::find(std::string const& uri, bool upda
} }
else else
{ {
try //try
{ //{
std::auto_ptr<mapnik::image_reader> reader(mapnik::get_image_reader(uri)); std::auto_ptr<mapnik::image_reader> reader(mapnik::get_image_reader(uri));
if (reader.get()) if (reader.get())
{ {
@ -116,12 +116,12 @@ boost::optional<marker_ptr> marker_cache::find(std::string const& uri, bool upda
cache_.insert(std::make_pair(uri,*result)); cache_.insert(std::make_pair(uri,*result));
} }
} }
} //}
catch (...) /*catch (...)
{ {
std::cerr << "Exception caught while loading image: " << uri << std::endl; std::cerr << "Exception caught while loading image: " << uri << std::endl;
} }*/
} }
} }
else else