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

[build] Use geojson.hpp from mapbox-base

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-08-30 13:23:25 +03:00
parent d4ef66c7b0
commit 0edc50561f
9 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

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

1
cmake/core.cmake
View File

@@ -28,7 +28,6 @@ target_link_libraries(mbgl-core PUBLIC
boost
mapbox-base-extras
mapbox-base
geojson.hpp
${ICU_LIBRARY}
polylabel
protozero

1
cmake/vendor.cmake
View File

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

1
misc/buck/mapbox-gl-native/BUCK
View File

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

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

@@ -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" ]);

1
vendor/geojson.hpp vendored

Submodule vendor/geojson.hpp deleted from 97f81eadb6

10
vendor/geojson.hpp-files.json vendored
View File

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

5
vendor/geojson.hpp.cmake vendored
View File

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

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

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