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

upgrade to latest variant.hpp

Browse source
This commit is contained in:
artemp 2016-05-09 11:42:46 +02:00
parent d97583b53e
commit 75189905d6
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SConstruct
View file

@ -1610,6 +1610,7 @@ if not preconfigured:
# prepend to make sure we link locally # prepend to make sure we link locally
env.Prepend(CPPPATH = '#deps/agg/include') env.Prepend(CPPPATH = '#deps/agg/include')
env.Prepend(LIBPATH = '#deps/agg') env.Prepend(LIBPATH = '#deps/agg')
env.Prepend(CPPPATH = '#deps/mapbox/variant/include')
# prepend deps dir for auxillary headers # prepend deps dir for auxillary headers
env.Prepend(CPPPATH = '#deps') env.Prepend(CPPPATH = '#deps')

2
deps/mapbox/variant vendored

@ -1 +1 @@
Subproject commit 35ca16c74f5712afb4f042f45ea64078fa0b630e Subproject commit 1bc46e525a9dec71af28f822e5fc031c1352ad2e

2
include/mapnik/util/variant.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_UTIL_VARIANT_HPP #define MAPNIK_UTIL_VARIANT_HPP
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapbox/variant/variant.hpp> #include <mapbox/variant.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>