diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-09-08 09:55:14 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-09-11 14:56:29 +0300 |
| commit | 06ca1fd4e5188e184a442de3281b24115460b4cf (patch) | |
| tree | d092aa5e9f9a0db2d9e8433f60e56d1f8f06207e | |
| parent | 6fdf07e3a7df8b94fbb78bd534b032006b70b470 (diff) | |
| download | qtlocation-mapboxgl-06ca1fd4e5188e184a442de3281b24115460b4cf.tar.gz | |
vendor-update
| -rw-r--r-- | cmake/vendor.cmake | 2 | ||||
| -rwxr-xr-x | scripts/generate-file-lists.js | 7 | ||||
| -rw-r--r-- | vendor/mapbox-base-files.json | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index b996aa2b70..aafa07d2d6 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -21,7 +21,7 @@ include(${CMAKE_SOURCE_DIR}/vendor/vector-tile.cmake) include(${CMAKE_SOURCE_DIR}/vendor/wagyu.cmake) if(NOT TARGET mapbox-base) - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-base ${CMAKE_BINARY_DIR}/.build-mapbox-gl-native-mapbox-base EXCLUDE_FROM_ALL) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-base ${CMAKE_BINARY_DIR}/.build-mapbox-gl-native-mapbox-base EXCLUDE_FROM_ALL) endif() if(MBGL_PLATFORM STREQUAL "linux" OR MBGL_PLATFORM STREQUAL "macos") diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js index d1f5e77585..5907981a7b 100755 --- a/scripts/generate-file-lists.js +++ b/scripts/generate-file-lists.js @@ -137,6 +137,7 @@ generateFileList('vendor/mapbox-base-files.json', [ 'vendor/mapbox-base/extras/kdbush.hpp', 'vendor/mapbox-base/extras/filesystem', 'vendor/mapbox-base/extras/rapidjson', + 'vendor/mapbox-base/extras/expected-lite', 'vendor/mapbox-base/mapbox/pixelmatch-cpp', 'vendor/mapbox-base/mapbox/geometry.hpp', 'vendor/mapbox-base/mapbox/variant', @@ -145,8 +146,10 @@ generateFileList('vendor/mapbox-base-files.json', 'vendor/mapbox-base/mapbox/geojson.hpp', 'vendor/mapbox-base/mapbox/jni.hpp', 'vendor/mapbox-base/mapbox/weak', - 'vendor/mapbox-base/mapbox/typewrapper' ], - vendorRegex, [ "include/*.hpp", "include/**/*.hpp", "include/**/*.h", "optional.hpp", ":!:include/jni/string_conversion.hpp" ]); + 'vendor/mapbox-base/mapbox/typewrapper', + 'vendor/mapbox-base/mapbox/io' ], + vendorRegex, [ "src/*.cpp", "include/*.hpp", "include/**/*.hpp", "include/**/*.h", "optional.hpp", + ":!:src/mapbox/geojson.cpp", ":!:include/jni/string_conversion.hpp" ]); generateFileList('vendor/polylabel-files.json', [ 'vendor/polylabel' ], vendorRegex, [ "include/**/*.hpp" ]); generateFileList('vendor/protozero-files.json', [ 'vendor/protozero' ], vendorRegex, [ "include/**/*.hpp" ]); generateFileList('vendor/shelf-pack-cpp-files.json', [ 'vendor/shelf-pack-cpp' ], vendorRegex, [ "include/**/*.hpp" ]); diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json index 7c638d2b80..4e1aa876df 100644 --- a/vendor/mapbox-base-files.json +++ b/vendor/mapbox-base-files.json @@ -1,7 +1,10 @@ { "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js", - "sources": [], + "sources": [ + "vendor/mapbox-base/mapbox/io/src/io.cpp" + ], "public_headers": { + "nonstd/expected.hpp": "vendor/mapbox-base/extras/expected-lite/include/nonstd/expected.hpp", "ghc/filesystem.hpp": "vendor/mapbox-base/extras/filesystem/include/ghc/filesystem.hpp", "ghc/fs_fwd.hpp": "vendor/mapbox-base/extras/filesystem/include/ghc/fs_fwd.hpp", "ghc/fs_impl.hpp": "vendor/mapbox-base/extras/filesystem/include/ghc/fs_impl.hpp", @@ -63,6 +66,7 @@ "mapbox/geometry/point_arithmetic.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp", "mapbox/geometry/polygon.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/polygon.hpp", "mapbox/geometry_io.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry_io.hpp", + "mapbox/io.hpp": "vendor/mapbox-base/mapbox/io/include/mapbox/io.hpp", "jni/advanced_ownership.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/advanced_ownership.hpp", "jni/array.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/array.hpp", "jni/arraylike.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/arraylike.hpp", |