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 | |
parent | d4ef66c7b06d00295a54d48646a6ef4be03d9c4f (diff) | |
download | qtlocation-mapboxgl-0edc50561ffc7d05bee3cae4db3c03eb36c11816.tar.gz |
[build] Use geojson.hpp from mapbox-base
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | cmake/core.cmake | 1 | ||||
-rw-r--r-- | cmake/vendor.cmake | 1 | ||||
-rw-r--r-- | misc/buck/mapbox-gl-native/BUCK | 1 | ||||
-rwxr-xr-x | scripts/generate-file-lists.js | 4 | ||||
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 |
9 files changed, 5 insertions, 23 deletions
diff --git a/.gitmodules b/.gitmodules index 4bbbda345e..76b365f5d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,9 +16,6 @@ [submodule "vendor/geojson-vt-cpp"] path = vendor/geojson-vt-cpp url = https://github.com/mapbox/geojson-vt-cpp.git -[submodule "vendor/geojson.hpp"] - path = vendor/geojson.hpp - url = https://github.com/mapbox/geojson.hpp.git [submodule "vendor/polylabel"] path = vendor/polylabel url = https://github.com/mapbox/polylabel.git diff --git a/cmake/core.cmake b/cmake/core.cmake index 223c479e7f..d0c6be9f59 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -28,7 +28,6 @@ target_link_libraries(mbgl-core PUBLIC boost mapbox-base-extras mapbox-base - geojson.hpp ${ICU_LIBRARY} polylabel protozero diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 2932bcf094..3b7976c500 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -11,7 +11,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/eternal.cmake) include(${CMAKE_SOURCE_DIR}/vendor/expected.cmake) include(${CMAKE_SOURCE_DIR}/vendor/filesystem.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/geojson.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/googletest.cmake) include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake) include(${CMAKE_SOURCE_DIR}/vendor/jni.hpp.cmake) diff --git a/misc/buck/mapbox-gl-native/BUCK b/misc/buck/mapbox-gl-native/BUCK index 10390ab830..fc99edc78b 100644 --- a/misc/buck/mapbox-gl-native/BUCK +++ b/misc/buck/mapbox-gl-native/BUCK @@ -43,7 +43,6 @@ mbgl_vendor_library("cheap-ruler-cpp") mbgl_vendor_library("earcut.hpp") mbgl_vendor_library("expected") mbgl_vendor_library("eternal") -mbgl_vendor_library("geojson.hpp") mbgl_vendor_library("geojson-vt-cpp") mbgl_vendor_library("jni.hpp") mbgl_vendor_library("mapbox-base") diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js index 3682d8c4a3..157596b542 100755 --- a/scripts/generate-file-lists.js +++ b/scripts/generate-file-lists.js @@ -134,7 +134,6 @@ generateFileList('vendor/eternal-files.json', [ 'vendor/eternal' ], vendorRegex, generateFileList('vendor/expected-files.json', [ 'vendor/expected' ], vendorRegex, [ "include/expected.hpp" ]); generateFileList('vendor/filesystem-files.json', [ 'vendor/filesystem' ], vendorRegex, [ "include/**/*.hpp" ]); generateFileList('vendor/geojson-vt-cpp-files.json', [ 'vendor/geojson-vt-cpp' ], vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/geojson.hpp-files.json', [ 'vendor/geojson.hpp' ], vendorRegex, [ "include/**/*.hpp" ]); generateFileList('vendor/icu-files.json', [ 'vendor/icu' ], vendorRegex, [ "include/**/*.h", "src/*.h", "src/*.cpp" ]); generateFileList('vendor/jni.hpp-files.json', [ 'vendor/jni.hpp' ], vendorRegex, [ "include/**/*.hpp", ":!:include/jni/string_conversion.hpp" ]); generateFileList('vendor/mapbox-base-files.json', @@ -142,7 +141,8 @@ generateFileList('vendor/mapbox-base-files.json', 'vendor/mapbox-base/mapbox/geometry.hpp', 'vendor/mapbox-base/mapbox/variant', 'vendor/mapbox-base/mapbox/optional', - 'vendor/mapbox-base/mapbox/supercluster.hpp' ], + 'vendor/mapbox-base/mapbox/supercluster.hpp', + 'vendor/mapbox-base/mapbox/geojson.hpp' ], vendorRegex, [ "include/*.hpp", "include/**/*.hpp", "optional.hpp" ]); generateFileList('vendor/pixelmatch-cpp-files.json', [ 'vendor/pixelmatch-cpp' ], vendorRegex, [ "include/**/*.hpp" ]); generateFileList('vendor/polylabel-files.json', [ 'vendor/polylabel' ], vendorRegex, [ "include/**/*.hpp" ]); 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", |