diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | cmake/core.cmake | 2 | ||||
| -rw-r--r-- | cmake/vendor.cmake | 1 | ||||
| -rw-r--r-- | misc/buck/mapbox-gl-native/BUCK | 1 | ||||
| -rwxr-xr-x | scripts/generate-file-lists.js | 4 | ||||
| m--------- | vendor/kdbush.hpp | 0 | ||||
| -rw-r--r-- | vendor/kdbush.hpp-files.json | 8 | ||||
| -rw-r--r-- | vendor/kdbush.hpp.cmake | 5 | ||||
| -rw-r--r-- | vendor/mapbox-base-files.json | 1 |
9 files changed, 4 insertions, 21 deletions
diff --git a/.gitmodules b/.gitmodules index 6a4f159814..4bbbda345e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,9 +37,6 @@ [submodule "vendor/expected-lite"] path = vendor/expected url = https://github.com/martinmoene/expected-lite.git -[submodule "vendor/kdbush.hpp"] - path = vendor/kdbush.hpp - url = https://github.com/mourner/kdbush.hpp.git [submodule "vendor/unique_resource"] path = vendor/unique_resource url = https://github.com/okdshin/unique_resource.git diff --git a/cmake/core.cmake b/cmake/core.cmake index d752607068..223c479e7f 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -12,7 +12,6 @@ target_link_libraries(mbgl-core PRIVATE eternal expected geojson-vt-cpp - kdbush.hpp shelf-pack-cpp unique_resource wagyu @@ -27,6 +26,7 @@ endif() # libraries in our public interface. target_link_libraries(mbgl-core PUBLIC boost + mapbox-base-extras mapbox-base geojson.hpp ${ICU_LIBRARY} diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 904516f664..2932bcf094 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -15,7 +15,6 @@ 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) -include(${CMAKE_SOURCE_DIR}/vendor/kdbush.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/nunicode.cmake) include(${CMAKE_SOURCE_DIR}/vendor/pixelmatch-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/polylabel.cmake) diff --git a/misc/buck/mapbox-gl-native/BUCK b/misc/buck/mapbox-gl-native/BUCK index 0b80eec64f..10390ab830 100644 --- a/misc/buck/mapbox-gl-native/BUCK +++ b/misc/buck/mapbox-gl-native/BUCK @@ -46,7 +46,6 @@ mbgl_vendor_library("eternal") mbgl_vendor_library("geojson.hpp") mbgl_vendor_library("geojson-vt-cpp") mbgl_vendor_library("jni.hpp") -mbgl_vendor_library("kdbush.hpp") mbgl_vendor_library("mapbox-base") mbgl_vendor_library("sqlite") mbgl_vendor_library("pixelmatch-cpp") diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js index d48d7893c0..3682d8c4a3 100755 --- a/scripts/generate-file-lists.js +++ b/scripts/generate-file-lists.js @@ -137,9 +137,9 @@ generateFileList('vendor/geojson-vt-cpp-files.json', [ 'vendor/geojson-vt-cpp' ] 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/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/extras/kdbush.hpp', + 'vendor/mapbox-base/mapbox/geometry.hpp', 'vendor/mapbox-base/mapbox/variant', 'vendor/mapbox-base/mapbox/optional', 'vendor/mapbox-base/mapbox/supercluster.hpp' ], diff --git a/vendor/kdbush.hpp b/vendor/kdbush.hpp deleted file mode 160000 -Subproject bbbbf6030f46d28add4d8e1b1436b89af3ffb92 diff --git a/vendor/kdbush.hpp-files.json b/vendor/kdbush.hpp-files.json deleted file mode 100644 index 94cbfb453d..0000000000 --- a/vendor/kdbush.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": { - "kdbush.hpp": "vendor/kdbush.hpp/include/kdbush.hpp" - }, - "private_headers": {} -} diff --git a/vendor/kdbush.hpp.cmake b/vendor/kdbush.hpp.cmake deleted file mode 100644 index 450530b7c6..0000000000 --- a/vendor/kdbush.hpp.cmake +++ /dev/null @@ -1,5 +0,0 @@ -add_library(kdbush.hpp INTERFACE) - -target_include_directories(kdbush.hpp SYSTEM INTERFACE - ${CMAKE_SOURCE_DIR}/vendor/kdbush.hpp/include -) diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json index 65827728dd..7d7d0d7c8f 100644 --- a/vendor/mapbox-base-files.json +++ b/vendor/mapbox-base-files.json @@ -2,6 +2,7 @@ "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js", "sources": [], "public_headers": { + "kdbush.hpp": "vendor/mapbox-base/extras/kdbush.hpp/include/kdbush.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", |