From 0c0b82dc27cbe15cc902ce2c1dac00d77eccc03c Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Fri, 30 Aug 2019 12:41:19 +0300 Subject: [build] Use supercluster.hpp from mapbox-base --- .gitmodules | 3 --- cmake/core.cmake | 1 - cmake/vendor.cmake | 1 - misc/buck/mapbox-gl-native/BUCK | 1 - scripts/generate-file-lists.js | 8 ++++++-- vendor/mapbox-base-files.json | 1 + vendor/supercluster.hpp | 1 - vendor/supercluster.hpp-files.json | 8 -------- vendor/supercluster.hpp.cmake | 5 ----- 9 files changed, 7 insertions(+), 22 deletions(-) delete mode 160000 vendor/supercluster.hpp delete mode 100644 vendor/supercluster.hpp-files.json delete mode 100644 vendor/supercluster.hpp.cmake diff --git a/.gitmodules b/.gitmodules index fd2e80d4bb..6a4f159814 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/cmake/core.cmake b/cmake/core.cmake index abb55d174a..d752607068 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -14,7 +14,6 @@ target_link_libraries(mbgl-core PRIVATE geojson-vt-cpp kdbush.hpp shelf-pack-cpp - supercluster.hpp unique_resource wagyu ) diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 0b164434c9..904516f664 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -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) diff --git a/misc/buck/mapbox-gl-native/BUCK b/misc/buck/mapbox-gl-native/BUCK index ed264e9756..0b80eec64f 100644 --- a/misc/buck/mapbox-gl-native/BUCK +++ b/misc/buck/mapbox-gl-native/BUCK @@ -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") diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js index e87f6479a1..d48d7893c0 100755 --- a/scripts/generate-file-lists.js +++ b/scripts/generate-file-lists.js @@ -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" ]); diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json index 4539877205..65827728dd 100644 --- a/vendor/mapbox-base-files.json +++ b/vendor/mapbox-base-files.json @@ -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", diff --git a/vendor/supercluster.hpp b/vendor/supercluster.hpp deleted file mode 160000 index 03c026c49c..0000000000 --- a/vendor/supercluster.hpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 03c026c49c3e25cb4c65f91a308ab869e98f6499 diff --git a/vendor/supercluster.hpp-files.json b/vendor/supercluster.hpp-files.json deleted file mode 100644 index 775dda8776..0000000000 --- a/vendor/supercluster.hpp-files.json +++ /dev/null @@ -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": {} -} diff --git a/vendor/supercluster.hpp.cmake b/vendor/supercluster.hpp.cmake deleted file mode 100644 index 90d0becade..0000000000 --- a/vendor/supercluster.hpp.cmake +++ /dev/null @@ -1,5 +0,0 @@ -add_library(supercluster.hpp INTERFACE) - -target_include_directories(supercluster.hpp SYSTEM INTERFACE - ${CMAKE_SOURCE_DIR}/vendor/supercluster.hpp/include -) -- cgit v1.2.1