Remove Mapbox optional (#2462)

This commit is contained in:
Bart Louwers
2024-06-03 21:54:13 +02:00
committed by GitHub
parent 028c26ee60
commit 02021259f0
6 changed files with 2 additions and 24 deletions

View File

@@ -1392,7 +1392,6 @@ export(TARGETS
mapbox-base-geojson.hpp
mapbox-base-geometry.hpp
mapbox-base-jni.hpp
mapbox-base-optional
mapbox-base-pixelmatch-cpp
mapbox-base-shelf-pack-cpp
mapbox-base-supercluster.hpp

View File

@@ -110,7 +110,6 @@ target_link_libraries(
PRIVATE
GLESv3
Mapbox::Base
Mapbox::Base::optional
log
mbgl-compiler-options
)

11
vendor/BUILD.bazel vendored
View File

@@ -44,7 +44,6 @@ cc_library(
"mapbox-base/include",
],
visibility = ["//visibility:public"],
deps = ["optional"],
)
# vendor/parsedate
@@ -57,15 +56,6 @@ cc_library(
visibility = ["//visibility:public"],
)
# vendor/optional
cc_library(
name = "optional",
hdrs = glob(["mapbox-base/deps/optional/*.hpp"]),
copts = CPP_FLAGS,
includes = ["mapbox-base/deps/optional"],
visibility = ["//visibility:public"],
)
# vendor/csscolorparser
cc_library(
name = "csscolorparser",
@@ -78,7 +68,6 @@ cc_library(
copts = CPP_FLAGS,
includes = ["csscolorparser"],
visibility = ["//visibility:public"],
deps = ["optional"],
)
# vendor/wagyu-files.json

View File

@@ -15,7 +15,7 @@ target_sources(
target_link_libraries(
mbgl-vendor-csscolorparser
PRIVATE Mapbox::Base::optional mbgl-compiler-options
PRIVATE mbgl-compiler-options
)
target_include_directories(

View File

@@ -76,15 +76,6 @@ set_target_properties(
INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/geometry.hpp/LICENSE
)
set_target_properties(
mapbox-base-optional
PROPERTIES
INTERFACE_MAPBOX_NAME "Optional"
INTERFACE_MAPBOX_URL "https://github.com/akrzemi1/Optional"
INTERFACE_MAPBOX_AUTHOR "Andrzej Krzemienski"
INTERFACE_MAPBOX_LICENSE ${CMAKE_CURRENT_LIST_DIR}/mapbox-base/deps/optional/LICENSE
)
set_target_properties(
mapbox-base
PROPERTIES