diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-30 13:23:25 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-02 14:09:08 +0300 |
commit | 0edc50561ffc7d05bee3cae4db3c03eb36c11816 (patch) | |
tree | 824e99adcdeb1dcdb5116bc789d70f946ae35188 /vendor | |
parent | d4ef66c7b06d00295a54d48646a6ef4be03d9c4f (diff) | |
download | qtlocation-mapboxgl-0edc50561ffc7d05bee3cae4db3c03eb36c11816.tar.gz |
[build] Use geojson.hpp from mapbox-base
Diffstat (limited to 'vendor')
m--------- | vendor/geojson.hpp | 0 | ||||
-rw-r--r-- | vendor/geojson.hpp-files.json | 10 | ||||
-rw-r--r-- | vendor/geojson.hpp.cmake | 5 | ||||
-rw-r--r-- | vendor/mapbox-base-files.json | 3 |
4 files changed, 3 insertions, 15 deletions
diff --git a/vendor/geojson.hpp b/vendor/geojson.hpp deleted file mode 160000 -Subproject 97f81eadb66f985af4ce59c003bce8718654198 diff --git a/vendor/geojson.hpp-files.json b/vendor/geojson.hpp-files.json deleted file mode 100644 index 609351bc0a..0000000000 --- a/vendor/geojson.hpp-files.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js", - "sources": [], - "public_headers": { - "mapbox/geojson.hpp": "vendor/geojson.hpp/include/mapbox/geojson.hpp", - "mapbox/geojson/rapidjson.hpp": "vendor/geojson.hpp/include/mapbox/geojson/rapidjson.hpp", - "mapbox/geojson_impl.hpp": "vendor/geojson.hpp/include/mapbox/geojson_impl.hpp" - }, - "private_headers": {} -} diff --git a/vendor/geojson.hpp.cmake b/vendor/geojson.hpp.cmake deleted file mode 100644 index 261650388f..0000000000 --- a/vendor/geojson.hpp.cmake +++ /dev/null @@ -1,5 +0,0 @@ -add_library(geojson.hpp INTERFACE) - -target_include_directories(geojson.hpp SYSTEM INTERFACE - ${CMAKE_SOURCE_DIR}/vendor/geojson.hpp/include -) diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json index 7d7d0d7c8f..1f27640540 100644 --- a/vendor/mapbox-base-files.json +++ b/vendor/mapbox-base-files.json @@ -3,6 +3,9 @@ "sources": [], "public_headers": { "kdbush.hpp": "vendor/mapbox-base/extras/kdbush.hpp/include/kdbush.hpp", + "mapbox/geojson.hpp": "vendor/mapbox-base/mapbox/geojson.hpp/include/mapbox/geojson.hpp", + "mapbox/geojson/rapidjson.hpp": "vendor/mapbox-base/mapbox/geojson.hpp/include/mapbox/geojson/rapidjson.hpp", + "mapbox/geojson_impl.hpp": "vendor/mapbox-base/mapbox/geojson.hpp/include/mapbox/geojson_impl.hpp", "mapbox/feature.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/feature.hpp", "mapbox/geometry.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry.hpp", "mapbox/geometry/box.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/box.hpp", |