[build] Bump mapbox-base
This will move geojson-vt-cpp and shelf-pack-cpp to mapbox-base collection of libraries.
This commit is contained in:
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
1
vendor/geojson-vt-cpp
vendored
1
vendor/geojson-vt-cpp
vendored
Submodule vendor/geojson-vt-cpp deleted from 32020bdcbf
12
vendor/geojson-vt-cpp.cmake
vendored
12
vendor/geojson-vt-cpp.cmake
vendored
@@ -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
|
||||
)
|
||||
2
vendor/mapbox-base
vendored
2
vendor/mapbox-base
vendored
Submodule vendor/mapbox-base updated: 52e06d824b...119576a63b
1
vendor/shelf-pack-cpp
vendored
1
vendor/shelf-pack-cpp
vendored
Submodule vendor/shelf-pack-cpp deleted from c231b596f1
12
vendor/shelf-pack-cpp.cmake
vendored
12
vendor/shelf-pack-cpp.cmake
vendored
@@ -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
|
||||
)
|
||||
Reference in New Issue
Block a user