diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-09-26 19:18:50 +0300 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2016-09-28 16:35:50 +0200 |
| commit | 4ef66f36d40c9801b6683fe18b27367c89159541 (patch) | |
| tree | 5d60be018b32de8dd41c084d5d32b4e66925175c | |
| parent | e0ffde7bc216083966ed575902513e6f06d9bafc (diff) | |
| download | qtlocation-mapboxgl-4ef66f36d40c9801b6683fe18b27367c89159541.tar.gz | |
[core] Use geojson as a header only library
| m--------- | .mason | 0 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/core-files.cmake | 1 | ||||
| -rw-r--r-- | src/mbgl/util/geojson.cpp | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/.mason b/.mason -Subproject 7cc64b1f32930d0de99381e21dd2cab9f474fa4 +Subproject 48ea4761bd386f9113397a4366d63e83e358664 diff --git a/CMakeLists.txt b/CMakeLists.txt index ec7210ca3f..84ea8dddb7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ mason_use(kdbush VERSION 0.1.1 HEADER_ONLY) mason_use(earcut VERSION 0.11 HEADER_ONLY) mason_use(protozero VERSION 1.4.2 HEADER_ONLY) mason_use(pixelmatch VERSION 0.9.0 HEADER_ONLY) -mason_use(geojson VERSION 0.3.0) +mason_use(geojson VERSION 0.3.1 HEADER_ONLY) if(WITH_COVERAGE) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage") diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index b7ee4ee313..bb329247ae 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -436,6 +436,7 @@ set(MBGL_CORE_FILES src/mbgl/util/exclusive.hpp src/mbgl/util/font_stack.cpp src/mbgl/util/geo.cpp + src/mbgl/util/geojson.cpp src/mbgl/util/grid_index.cpp src/mbgl/util/grid_index.hpp src/mbgl/util/http_header.cpp diff --git a/src/mbgl/util/geojson.cpp b/src/mbgl/util/geojson.cpp new file mode 100644 index 0000000000..d1608e09fe --- /dev/null +++ b/src/mbgl/util/geojson.cpp @@ -0,0 +1 @@ +#include <mapbox/geojson_impl.hpp> |