[build] Replace geometry.hpp/variant with mapbox-base

8 files changed, 28 insertions, 45 deletions

diff --git a/vendor/geometry.hpp b/vendor/geometry.hpp
deleted file mode 160000
-Subproject c83a2ab18a225254f128b6f5115aa39d04f2de2
diff --git a/vendor/geometry.hpp-files.json b/vendor/geometry.hpp-files.json
deleted file mode 100644
index 942d372a38..0000000000
--- a/vendor/geometry.hpp-files.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js",
-    "sources": [],
-    "public_headers": {
-        "mapbox/feature.hpp": "vendor/geometry.hpp/include/mapbox/feature.hpp",
-        "mapbox/geometry.hpp": "vendor/geometry.hpp/include/mapbox/geometry.hpp",
-        "mapbox/geometry/box.hpp": "vendor/geometry.hpp/include/mapbox/geometry/box.hpp",
-        "mapbox/geometry/empty.hpp": "vendor/geometry.hpp/include/mapbox/geometry/empty.hpp",
-        "mapbox/geometry/envelope.hpp": "vendor/geometry.hpp/include/mapbox/geometry/envelope.hpp",
-        "mapbox/geometry/for_each_point.hpp": "vendor/geometry.hpp/include/mapbox/geometry/for_each_point.hpp",
-        "mapbox/geometry/geometry.hpp": "vendor/geometry.hpp/include/mapbox/geometry/geometry.hpp",
-        "mapbox/geometry/line_string.hpp": "vendor/geometry.hpp/include/mapbox/geometry/line_string.hpp",
-        "mapbox/geometry/multi_line_string.hpp": "vendor/geometry.hpp/include/mapbox/geometry/multi_line_string.hpp",
-        "mapbox/geometry/multi_point.hpp": "vendor/geometry.hpp/include/mapbox/geometry/multi_point.hpp",
-        "mapbox/geometry/multi_polygon.hpp": "vendor/geometry.hpp/include/mapbox/geometry/multi_polygon.hpp",
-        "mapbox/geometry/point.hpp": "vendor/geometry.hpp/include/mapbox/geometry/point.hpp",
-        "mapbox/geometry/point_arithmetic.hpp": "vendor/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp",
-        "mapbox/geometry/polygon.hpp": "vendor/geometry.hpp/include/mapbox/geometry/polygon.hpp",
-        "mapbox/geometry_io.hpp": "vendor/geometry.hpp/include/mapbox/geometry_io.hpp"
-    },
-    "private_headers": {}
-}
diff --git a/vendor/geometry.hpp.cmake b/vendor/geometry.hpp.cmake
deleted file mode 100644
index d97c2a9f6c..0000000000
--- a/vendor/geometry.hpp.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-add_library(geometry.hpp INTERFACE)
-
-target_include_directories(geometry.hpp SYSTEM INTERFACE
-    ${CMAKE_SOURCE_DIR}/vendor/geometry.hpp/include
-)
diff --git a/vendor/mapbox-base b/vendor/mapbox-base
new file mode 160000
+Subproject 5a24532b9363f2871bc26377e7901dd87faef6d
diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json
new file mode 100644
index 0000000000..dc12c3647b
--- /dev/null
+++ b/vendor/mapbox-base-files.json
@@ -0,0 +1,28 @@
+{
+    "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js",
+    "sources": [],
+    "public_headers": {
+        "mapbox/feature.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/feature.hpp",
+        "mapbox/geometry.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry.hpp",
+        "mapbox/geometry/box.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/box.hpp",
+        "mapbox/geometry/empty.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/empty.hpp",
+        "mapbox/geometry/envelope.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/envelope.hpp",
+        "mapbox/geometry/for_each_point.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/for_each_point.hpp",
+        "mapbox/geometry/geometry.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/geometry.hpp",
+        "mapbox/geometry/line_string.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/line_string.hpp",
+        "mapbox/geometry/multi_line_string.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/multi_line_string.hpp",
+        "mapbox/geometry/multi_point.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/multi_point.hpp",
+        "mapbox/geometry/multi_polygon.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/multi_polygon.hpp",
+        "mapbox/geometry/point.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/point.hpp",
+        "mapbox/geometry/point_arithmetic.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp",
+        "mapbox/geometry/polygon.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/polygon.hpp",
+        "mapbox/geometry_io.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry_io.hpp",
+        "mapbox/optional.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/optional.hpp",
+        "mapbox/recursive_wrapper.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/recursive_wrapper.hpp",
+        "mapbox/variant.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant.hpp",
+        "mapbox/variant_cast.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant_cast.hpp",
+        "mapbox/variant_io.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant_io.hpp",
+        "mapbox/variant_visitor.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant_visitor.hpp"
+    },
+    "private_headers": {}
+}
diff --git a/vendor/variant b/vendor/variant
deleted file mode 160000
-Subproject cb02ad487e069e050e5db11b1e5e9ccbe269e2f
diff --git a/vendor/variant-files.json b/vendor/variant-files.json
deleted file mode 100644
index 28998fd4a1..0000000000
--- a/vendor/variant-files.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js",
-    "sources": [],
-    "public_headers": {
-        "mapbox/optional.hpp": "vendor/variant/include/mapbox/optional.hpp",
-        "mapbox/recursive_wrapper.hpp": "vendor/variant/include/mapbox/recursive_wrapper.hpp",
-        "mapbox/variant.hpp": "vendor/variant/include/mapbox/variant.hpp",
-        "mapbox/variant_cast.hpp": "vendor/variant/include/mapbox/variant_cast.hpp",
-        "mapbox/variant_io.hpp": "vendor/variant/include/mapbox/variant_io.hpp",
-        "mapbox/variant_visitor.hpp": "vendor/variant/include/mapbox/variant_visitor.hpp"
-    },
-    "private_headers": {}
-}
diff --git a/vendor/variant.cmake b/vendor/variant.cmake
deleted file mode 100644
index f4827f41c6..0000000000
--- a/vendor/variant.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-add_library(variant INTERFACE)
-
-target_include_directories(variant SYSTEM INTERFACE
-    ${CMAKE_SOURCE_DIR}/vendor/variant/include
-)