diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | cmake/render-test.cmake | 2 | ||||
| -rw-r--r-- | cmake/vendor.cmake | 1 | ||||
| -rwxr-xr-x | scripts/generate-file-lists.js | 2 | ||||
| m--------- | vendor/filesystem | 0 | ||||
| -rw-r--r-- | vendor/filesystem-files.json | 13 | ||||
| -rw-r--r-- | vendor/filesystem.cmake | 5 | ||||
| -rw-r--r-- | vendor/mapbox-base-files.json | 6 |
8 files changed, 8 insertions, 24 deletions
diff --git a/.gitmodules b/.gitmodules index a9bc2ccef1..8d8c42911e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -76,9 +76,6 @@ [submodule "vendor/mapbox-gl-styles"] path = vendor/mapbox-gl-styles url = https://github.com/mapbox/mapbox-gl-styles.git -[submodule "vendor/filesystem"] - path = vendor/filesystem - url = https://github.com/gulrak/filesystem.git [submodule "vendor/mapbox-base"] path = vendor/mapbox-base url = https://github.com/mapbox/mapbox-base.git diff --git a/cmake/render-test.cmake b/cmake/render-test.cmake index 552b90dd0d..0da5544eaa 100644 --- a/cmake/render-test.cmake +++ b/cmake/render-test.cmake @@ -22,7 +22,7 @@ target_link_libraries(mbgl-render-test PRIVATE mbgl-filesource Mapbox::Base::Extras::args expected - filesystem + Mapbox::Base::Extras::filesystem pixelmatch-cpp rapidjson ) diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 66fd084dfa..7d442caf1e 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -9,7 +9,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/cheap-ruler-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/earcut.hpp.cmake) 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/googletest.cmake) include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake) diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js index 2f50b98b31..9646c6fe4b 100755 --- a/scripts/generate-file-lists.js +++ b/scripts/generate-file-lists.js @@ -131,11 +131,11 @@ generateFileList('vendor/cheap-ruler-cpp-files.json', [ 'vendor/cheap-ruler-cpp' generateFileList('vendor/earcut.hpp-files.json', [ 'vendor/earcut.hpp' ], vendorRegex, [ "include/**/*.hpp" ]); generateFileList('vendor/eternal-files.json', [ 'vendor/eternal' ], vendorRegex, [ "include/**/*.hpp" ]); 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/icu-files.json', [ 'vendor/icu' ], vendorRegex, [ "include/**/*.h", "src/*.h", "src/*.cpp" ]); generateFileList('vendor/mapbox-base-files.json', [ 'vendor/mapbox-base/extras/kdbush.hpp', + 'vendor/mapbox-base/extras/filesystem', 'vendor/mapbox-base/mapbox/geometry.hpp', 'vendor/mapbox-base/mapbox/variant', 'vendor/mapbox-base/mapbox/optional', diff --git a/vendor/filesystem b/vendor/filesystem deleted file mode 160000 -Subproject 091c08663ac3e38aea1ccaeae235340f5154f5a diff --git a/vendor/filesystem-files.json b/vendor/filesystem-files.json deleted file mode 100644 index d65e9c828e..0000000000 --- a/vendor/filesystem-files.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js", - "sources": [], - "public_headers": { - "ghc/filesystem.hpp": "vendor/filesystem/include/ghc/filesystem.hpp", - "ghc/fs_fwd.hpp": "vendor/filesystem/include/ghc/fs_fwd.hpp", - "ghc/fs_impl.hpp": "vendor/filesystem/include/ghc/fs_impl.hpp", - "ghc/fs_std.hpp": "vendor/filesystem/include/ghc/fs_std.hpp", - "ghc/fs_std_fwd.hpp": "vendor/filesystem/include/ghc/fs_std_fwd.hpp", - "ghc/fs_std_impl.hpp": "vendor/filesystem/include/ghc/fs_std_impl.hpp" - }, - "private_headers": {} -} diff --git a/vendor/filesystem.cmake b/vendor/filesystem.cmake deleted file mode 100644 index fe2701890d..0000000000 --- a/vendor/filesystem.cmake +++ /dev/null @@ -1,5 +0,0 @@ -add_library(filesystem INTERFACE) - -target_include_directories(filesystem SYSTEM INTERFACE - ${CMAKE_SOURCE_DIR}/vendor/filesystem/include -) diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json index 816f3af818..7d3a1a37aa 100644 --- a/vendor/mapbox-base-files.json +++ b/vendor/mapbox-base-files.json @@ -2,6 +2,12 @@ "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js", "sources": [], "public_headers": { + "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", + "ghc/fs_std.hpp": "vendor/mapbox-base/extras/filesystem/include/ghc/fs_std.hpp", + "ghc/fs_std_fwd.hpp": "vendor/mapbox-base/extras/filesystem/include/ghc/fs_std_fwd.hpp", + "ghc/fs_std_impl.hpp": "vendor/mapbox-base/extras/filesystem/include/ghc/fs_std_impl.hpp", "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", |