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

move SHAPE_MEMORY_MAPPED_FILE to be a global define

Browse source
This commit is contained in:
Dane Springmeyer 2013-08-13 14:48:04 -04:00
parent cf6e08aa52
commit 4eef244e73
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/input/shape/build.py
View file

@ -45,9 +45,6 @@ libraries.append('boost_system%s' % env['BOOST_APPEND'])
cppdefines = [] cppdefines = []
cxxflags = [] cxxflags = []
if env['SHAPE_MEMORY_MAPPED_FILE']:
cppdefines.append('-DSHAPE_MEMORY_MAPPED_FILE')
if env.get('BOOST_LIB_VERSION_FROM_HEADER'): if env.get('BOOST_LIB_VERSION_FROM_HEADER'):
boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1]) boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1])
if boost_version_from_header < 46: if boost_version_from_header < 46:

3
src/build.py
View file

@ -336,6 +336,9 @@ if env['SVG_RENDERER']: # svg backend
lib_env.Append(CPPDEFINES = '-DSVG_RENDERER') lib_env.Append(CPPDEFINES = '-DSVG_RENDERER')
libmapnik_defines.append('-DSVG_RENDERER') libmapnik_defines.append('-DSVG_RENDERER')
if env['SHAPE_MEMORY_MAPPED_FILE']:
lib_env.Append(CPPDEFINES = '-DSHAPE_MEMORY_MAPPED_FILE')
libmapnik_defines.append('-DSHAPE_MEMORY_MAPPED_FILE')
if env.get('BOOST_LIB_VERSION_FROM_HEADER'): if env.get('BOOST_LIB_VERSION_FROM_HEADER'):
boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1]) boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1])

4
src/mapped_memory_cache.cpp
View file

@ -20,6 +20,8 @@
* *
*****************************************************************************/ *****************************************************************************/
#if defined(SHAPE_MEMORY_MAPPED_FILE)
// mapnik // mapnik
#include <mapnik/debug.hpp> #include <mapnik/debug.hpp>
#include <mapnik/util/fs.hpp> #include <mapnik/util/fs.hpp>
@ -96,3 +98,5 @@ boost::optional<mapped_region_ptr> mapped_memory_cache::find(std::string const&
} }
} }
#endif