tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] Use filesystem from mapbox-base

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-08-30 15:32:14 +03:00
parent 805eede8c4
commit 899287b4ad
8 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -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

2
cmake/render-test.cmake
View File

@@ -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
)

1
cmake/vendor.cmake
View File

@@ -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)

2
scripts/generate-file-lists.js
View File

@@ -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',

1
vendor/filesystem vendored

Submodule vendor/filesystem deleted from 091c08663a

13
vendor/filesystem-files.json vendored
View File

@@ -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": {}
}

5
vendor/filesystem.cmake vendored
View File

@@ -1,5 +0,0 @@
add_library(filesystem INTERFACE)
target_include_directories(filesystem SYSTEM INTERFACE
${CMAKE_SOURCE_DIR}/vendor/filesystem/include
)

6
vendor/mapbox-base-files.json vendored
View File

@@ -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",