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

[build] Use supercluster.hpp from mapbox-base

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-08-30 12:41:19 +03:00
parent ef124e9331
commit 0c0b82dc27
9 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -28,9 +28,6 @@
[submodule "vendor/shelf-pack-cpp"]
path = vendor/shelf-pack-cpp
url = https://github.com/mapbox/shelf-pack-cpp.git
[submodule "vendor/supercluster.hpp"]
path = vendor/supercluster.hpp
url = https://github.com/mapbox/supercluster.hpp.git
[submodule "vendor/vector-tile"]
path = vendor/vector-tile
url = https://github.com/mapbox/vector-tile.git

1
cmake/core.cmake
View File

@@ -14,7 +14,6 @@ target_link_libraries(mbgl-core PRIVATE
geojson-vt-cpp
kdbush.hpp
shelf-pack-cpp
supercluster.hpp
unique_resource
wagyu
)

1
cmake/vendor.cmake
View File

@@ -22,7 +22,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/polylabel.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/protozero.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/rapidjson.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/shelf-pack-cpp.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/supercluster.hpp.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/unique_resource.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/vector-tile.cmake)
include(${CMAKE_SOURCE_DIR}/vendor/wagyu.cmake)

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

@@ -54,7 +54,6 @@ mbgl_vendor_library("polylabel")
mbgl_vendor_library("protozero")
mbgl_vendor_library("rapidjson")
mbgl_vendor_library("shelf-pack-cpp")
mbgl_vendor_library("supercluster.hpp")
mbgl_vendor_library("unique_resource")
mbgl_vendor_library("vector-tile")
mbgl_vendor_library("wagyu")

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

@@ -138,14 +138,18 @@ generateFileList('vendor/geojson.hpp-files.json', [ 'vendor/geojson.hpp' ], vend
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/kdbush.hpp-files.json', [ 'vendor/kdbush.hpp' ], vendorRegex, [ "include/*.hpp" ]);
generateFileList('vendor/mapbox-base-files.json', [ 'vendor/mapbox-base/mapbox/geometry.hpp', 'vendor/mapbox-base/mapbox/variant', 'vendor/mapbox-base/mapbox/optional' ], vendorRegex, [ "include/*.hpp", "include/**/*.hpp", "optional.hpp" ]);
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' ],
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" ]);
generateFileList('vendor/protozero-files.json', [ 'vendor/protozero' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/rapidjson-files.json', [ 'vendor/rapidjson' ], vendorRegex, [ "include/**/*.h" ]);
generateFileList('vendor/shelf-pack-cpp-files.json', [ 'vendor/shelf-pack-cpp' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/sqlite-files.json', [ 'vendor/sqlite' ], vendorRegex, [ "include/*.h", "src/*.c" ]);
generateFileList('vendor/supercluster.hpp-files.json', [ 'vendor/supercluster.hpp' ], vendorRegex, [ "include/*.hpp" ]);
generateFileList('vendor/unique_resource-files.json', [ 'vendor/unique_resource' ], vendorRegex, [ "unique_resource.hpp" ]);
generateFileList('vendor/vector-tile-files.json', [ 'vendor/vector-tile' ], vendorRegex, [ "include/**/*.hpp" ]);
generateFileList('vendor/wagyu-files.json', [ 'vendor/wagyu' ], vendorRegex, [ "include/**/*.hpp" ]);

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

@@ -18,6 +18,7 @@
"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",
"optional.hpp": "vendor/mapbox-base/mapbox/optional/optional.hpp",
"supercluster.hpp": "vendor/mapbox-base/mapbox/supercluster.hpp/include/supercluster.hpp",
"mapbox/optional.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/optional.hpp",
"mapbox/recursive_wrapper.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/recursive_wrapper.hpp",
"mapbox/variant.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/variant.hpp",

1
vendor/supercluster.hpp vendored

Submodule vendor/supercluster.hpp deleted from 03c026c49c

8
vendor/supercluster.hpp-files.json vendored
View File

@@ -1,8 +0,0 @@
{
"//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js",
"sources": [],
"public_headers": {
"supercluster.hpp": "vendor/supercluster.hpp/include/supercluster.hpp"
},
"private_headers": {}
}

5
vendor/supercluster.hpp.cmake vendored
View File

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