[build] Bump mapbox-base

This will move geojson-vt-cpp and shelf-pack-cpp to mapbox-base collection of libraries.
mapbox · Feb 24, 2020 · f105100 · f105100
1 parent 75f861f
commit f105100
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 37 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,18 +10,12 @@
 [submodule "vendor/earcut.hpp"]
 	path = vendor/earcut.hpp
 	url = https://github.com/mapbox/earcut.hpp.git
-[submodule "vendor/geojson-vt-cpp"]
-	path = vendor/geojson-vt-cpp
-	url = https://github.com/mapbox/geojson-vt-cpp.git
 [submodule "vendor/polylabel"]
 	path = vendor/polylabel
 	url = https://github.com/mapbox/polylabel.git
 [submodule "vendor/protozero"]
 	path = vendor/protozero
 	url = https://github.com/mapbox/protozero.git
-[submodule "vendor/shelf-pack-cpp"]
-	path = vendor/shelf-pack-cpp
-	url = https://github.com/mapbox/shelf-pack-cpp.git
 [submodule "vendor/vector-tile"]
 	path = vendor/vector-tile
 	url = https://github.com/mapbox/vector-tile.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -960,10 +960,8 @@ endif()
 include(${PROJECT_SOURCE_DIR}/vendor/boost.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/earcut.hpp.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/eternal.cmake)
-include(${PROJECT_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/polylabel.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/protozero.cmake)
-include(${PROJECT_SOURCE_DIR}/vendor/shelf-pack-cpp.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/unique_resource.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/vector-tile.cmake)
 include(${PROJECT_SOURCE_DIR}/vendor/wagyu.cmake)
@@ -973,14 +971,14 @@ target_link_libraries(
     PRIVATE
         Mapbox::Base::Extras::kdbush.hpp
         Mapbox::Base::supercluster.hpp
+        Mapbox::Base::shelf-pack-cpp
+        Mapbox::Base::geojson-vt-cpp
         mbgl-compiler-options
         mbgl-vendor-boost
         mbgl-vendor-earcut.hpp
         mbgl-vendor-eternal
-        mbgl-vendor-geojson-vt-cpp
         mbgl-vendor-polylabel
         mbgl-vendor-protozero
-        mbgl-vendor-shelf-pack-cpp
         mbgl-vendor-unique_resource
         mbgl-vendor-vector-tile
         mbgl-vendor-wagyu

diff --git a/vendor/geojson-vt-cpp b/vendor/geojson-vt-cpp
diff --git a/vendor/geojson-vt-cpp.cmake b/vendor/geojson-vt-cpp.cmake
diff --git a/vendor/mapbox-base b/vendor/mapbox-base
diff --git a/vendor/shelf-pack-cpp b/vendor/shelf-pack-cpp
diff --git a/vendor/shelf-pack-cpp.cmake b/vendor/shelf-pack-cpp.cmake
+9 −0		.gitmodules
+5 −0		mapbox/CMakeLists.txt
+1 −0		mapbox/cheap-ruler-cpp
+1 −0		mapbox/geojson-vt-cpp
+1 −1		mapbox/jni.hpp
+1 −0		mapbox/shelf-pack-cpp
+3 −0		test/CMakeLists.txt
+9 −0		test/include.cpp