[build] Use args from mapbox-base

.gitmodules

@@ -70,9 +70,6 @@
 [submodule "platform/darwin/docs/theme"]
 	path = platform/darwin/docs/theme
 	url = https://github.com/mapbox/jazzy-theme.git
-[submodule "vendor/args"]
-	path = vendor/args
-	url = https://github.com/Taywee/args
 [submodule "vendor/mvt-fixtures"]
 	path = vendor/mvt-fixtures
 	url = https://github.com/mapbox/mvt-fixtures.git

cmake/glfw.cmake

@@ -23,7 +23,7 @@ target_link_libraries(mbgl-glfw
     PRIVATE mbgl-core
     PRIVATE glfw
     PRIVATE cheap-ruler-cpp
-    PRIVATE args
+    PRIVATE Mapbox::Base::Extras::args
 )
 
 mbgl_platform_glfw()

cmake/offline.cmake

@@ -12,7 +12,7 @@ target_include_directories(mbgl-offline
 
 target_link_libraries(mbgl-offline
     PRIVATE mbgl-core
-    PRIVATE args
+    PRIVATE Mapbox::Base::Extras::args
 )
 
 mbgl_platform_offline()

cmake/render-test.cmake

@@ -20,7 +20,7 @@ target_include_directories(mbgl-render-test
 target_link_libraries(mbgl-render-test PRIVATE
     mbgl-core
     mbgl-filesource
-    args
+    Mapbox::Base::Extras::args
     expected
     filesystem
     pixelmatch-cpp

cmake/render.cmake

@@ -8,7 +8,7 @@ target_include_directories(mbgl-render
 
 target_link_libraries(mbgl-render
     PRIVATE mbgl-core
-    PRIVATE args
+    PRIVATE Mapbox::Base::Extras::args
 )
 
 mbgl_platform_render()

cmake/test.cmake

@@ -24,7 +24,7 @@ target_include_directories(mbgl-test
 
 target_link_libraries(mbgl-test PRIVATE
     googletest
-    args
+    Mapbox::Base::Extras::args
     mbgl-core
     shelf-pack-cpp
     unique_resource

cmake/vendor.cmake

@@ -22,7 +22,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/shelf-pack-cpp.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/unique_resource.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/vector-tile.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/wagyu.cmake)
-include(${CMAKE_SOURCE_DIR}/vendor/args.cmake)
 
 if(NOT TARGET mapbox-base)
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-base ${CMAKE_BINARY_DIR}/.build-mapbox-gl-native-mapbox-base)

scripts/generate-file-lists.js

@@ -126,7 +126,6 @@ generateXcodeSourceList('platform/macos/macos.xcodeproj', 'dynamic', 'sdk');
 generateXcodeSourceList('platform/ios/ios.xcodeproj', 'dynamic', 'sdk');
 
 const vendorRegex = /^(?:(?:src|include)\/)?(?:(.+)\/)?[^\/]+$/
-generateFileList('vendor/args-files.json', [ 'vendor/args' ], vendorRegex, [ "args.hxx" ]);
 generateFileList('vendor/boost-files.json', [ 'vendor/boost' ], vendorRegex, [ "include/**/*.hpp", "include/**/*.h" ]);
 generateFileList('vendor/cheap-ruler-cpp-files.json', [ 'vendor/cheap-ruler-cpp' ], vendorRegex, [ "include/**/*.hpp" ]);
 generateFileList('vendor/earcut.hpp-files.json', [ 'vendor/earcut.hpp' ], vendorRegex, [ "include/**/*.hpp" ]);

vendor/args-files.json

@@ -1,8 +0,0 @@
-{
-    "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js",
-    "sources": [],
-    "public_headers": {
-        "args.hxx": "vendor/args/args.hxx"
-    },
-    "private_headers": {}
-}

vendor/args.cmake

@@ -1,5 +0,0 @@
-add_library(args INTERFACE)
-
-target_include_directories(args SYSTEM INTERFACE
-    ${CMAKE_SOURCE_DIR}/vendor/args
-)