diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-02-24 15:49:11 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-02-24 15:49:11 +0200 |
| commit | c43213800c8b24d0212d491d340dc80b04dbe869 (patch) | |
| tree | b469f635c56eb1783b62de10ceefbefa41a44132 | |
| parent | 75f861fe4701e82081566c76c949bada75169be7 (diff) | |
| download | qtlocation-mapboxgl-upstream/tmpsantos-update-mapbox-base.tar.gz | |
[build] Bump mapbox-baseupstream/tmpsantos-update-mapbox-base
This will move geojson-vt-cpp and shelf-pack-cpp
to mapbox-base collection of libraries.
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| m--------- | vendor/geojson-vt-cpp | 0 | ||||
| -rw-r--r-- | vendor/geojson-vt-cpp.cmake | 12 | ||||
| m--------- | vendor/mapbox-base | 0 | ||||
| m--------- | vendor/shelf-pack-cpp | 0 | ||||
| -rw-r--r-- | vendor/shelf-pack-cpp.cmake | 12 |
7 files changed, 2 insertions, 34 deletions
diff --git a/.gitmodules b/.gitmodules index cd6db33ae3..93a163d230 100644 --- 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 index fab5319f74..8d1490aea4 100644 --- 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 deleted file mode 160000 -Subproject 32020bdcbf6d08787577738c9c94ca68e7f836f diff --git a/vendor/geojson-vt-cpp.cmake b/vendor/geojson-vt-cpp.cmake deleted file mode 100644 index 60afe5613d..0000000000 --- a/vendor/geojson-vt-cpp.cmake +++ /dev/null @@ -1,12 +0,0 @@ -if(TARGET mbgl-vendor-geojson-vt-cpp) - return() -endif() - -add_library( - mbgl-vendor-geojson-vt-cpp INTERFACE -) - -target_include_directories( - mbgl-vendor-geojson-vt-cpp SYSTEM - INTERFACE ${CMAKE_CURRENT_LIST_DIR}/geojson-vt-cpp/include -) diff --git a/vendor/mapbox-base b/vendor/mapbox-base -Subproject 52e06d824be1986643f8c058dea78223e1e5267 +Subproject 119576a63bf9de51a1af7d227f4a634a4e276fc diff --git a/vendor/shelf-pack-cpp b/vendor/shelf-pack-cpp deleted file mode 160000 -Subproject c231b596f1ca810d603af672f52ffeba10c9711 diff --git a/vendor/shelf-pack-cpp.cmake b/vendor/shelf-pack-cpp.cmake deleted file mode 100644 index 5b0cf01e5e..0000000000 --- a/vendor/shelf-pack-cpp.cmake +++ /dev/null @@ -1,12 +0,0 @@ -if(TARGET mbgl-vendor-shelf-pack-cpp) - return() -endif() - -add_library( - mbgl-vendor-shelf-pack-cpp INTERFACE -) - -target_include_directories( - mbgl-vendor-shelf-pack-cpp SYSTEM - INTERFACE ${CMAKE_CURRENT_LIST_DIR}/shelf-pack-cpp/include -) |