From 4eef244e736cbd4724453720922cc84ceae16a6b Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 13 Aug 2013 14:48:04 -0400 Subject: [PATCH] move SHAPE_MEMORY_MAPPED_FILE to be a global define --- plugins/input/shape/build.py | 3 --- src/build.py | 3 +++ src/mapped_memory_cache.cpp | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/input/shape/build.py b/plugins/input/shape/build.py index 3d07be202..64a66d5b4 100644 --- a/plugins/input/shape/build.py +++ b/plugins/input/shape/build.py @@ -45,9 +45,6 @@ libraries.append('boost_system%s' % env['BOOST_APPEND']) cppdefines = [] cxxflags = [] -if env['SHAPE_MEMORY_MAPPED_FILE']: - cppdefines.append('-DSHAPE_MEMORY_MAPPED_FILE') - if env.get('BOOST_LIB_VERSION_FROM_HEADER'): boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1]) if boost_version_from_header < 46: diff --git a/src/build.py b/src/build.py index cfb68d7f8..a15d2a464 100644 --- a/src/build.py +++ b/src/build.py @@ -336,6 +336,9 @@ if env['SVG_RENDERER']: # svg backend lib_env.Append(CPPDEFINES = '-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'): boost_version_from_header = int(env['BOOST_LIB_VERSION_FROM_HEADER'].split('_')[1]) diff --git a/src/mapped_memory_cache.cpp b/src/mapped_memory_cache.cpp index 8a933730c..84cd66fde 100644 --- a/src/mapped_memory_cache.cpp +++ b/src/mapped_memory_cache.cpp @@ -20,6 +20,8 @@ * *****************************************************************************/ +#if defined(SHAPE_MEMORY_MAPPED_FILE) + // mapnik #include #include @@ -96,3 +98,5 @@ boost::optional mapped_memory_cache::find(std::string const& } } + +#endif \ No newline at end of file