13 files changed, 24 insertions, 21 deletions
diff --git a/.gitmodules b/.gitmodules
index a36fee4c0e..aeb2663b84 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -91,3 +91,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
diff --git a/bin/offline.cpp b/bin/offline.cpp
index e5ce1f75fe..5cd43adfe3 100644
--- a/bin/offline.cpp
+++ b/bin/offline.cpp
@@ -5,7 +5,7 @@
 
 #include <mbgl/storage/default_file_source.hpp>
 
-#include <args/args.hxx>
+#include <args.hxx>
 
 #include <cstdlib>
 #include <iostream>
diff --git a/bin/render.cpp b/bin/render.cpp
index 41701913b0..c22d551928 100644
--- a/bin/render.cpp
+++ b/bin/render.cpp
@@ -8,7 +8,7 @@
 #include <mbgl/util/default_thread_pool.hpp>
 #include <mbgl/style/style.hpp>
 
-#include <args/args.hxx>
+#include <args.hxx>
 
 #include <cstdlib>
 #include <iostream>
diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake
index a2adb9fbb5..4ef6890cef 100644
--- a/cmake/glfw.cmake
+++ b/cmake/glfw.cmake
@@ -2,9 +2,6 @@ add_executable(mbgl-glfw
     platform/glfw/main.cpp
 )
 
-# args requires RTTI
-set_source_files_properties(platform/glfw/main.cpp PROPERTIES COMPILE_OPTIONS "-frtti")
-
 target_sources(mbgl-glfw
     PRIVATE platform/glfw/glfw_view.hpp
     PRIVATE platform/glfw/glfw_view.cpp
@@ -23,10 +20,9 @@ target_link_libraries(mbgl-glfw
     PRIVATE mbgl-core
     PRIVATE glfw
     PRIVATE cheap-ruler-cpp
+    PRIVATE args
 )
 
-target_add_mason_package(mbgl-glfw PRIVATE args)
-
 mbgl_platform_glfw()
 
 create_source_groups(mbgl-glfw)
diff --git a/cmake/mason-dependencies.cmake b/cmake/mason-dependencies.cmake
index 71a94f096f..a6ef7a3a53 100644
--- a/cmake/mason-dependencies.cmake
+++ b/cmake/mason-dependencies.cmake
@@ -8,14 +8,11 @@ elseif(MBGL_PLATFORM STREQUAL "linux")
     mason_use(libuv VERSION 1.9.1)
     mason_use(libpng VERSION 1.6.25)
     mason_use(libjpeg-turbo VERSION 1.5.0)
-    mason_use(args VERSION 6.2.0 HEADER_ONLY)
 
     if(WITH_EGL)
         mason_use(swiftshader VERSION 2018-05-31)
     endif()
 elseif(MBGL_PLATFORM STREQUAL "macos")
-    mason_use(args VERSION 6.2.0 HEADER_ONLY)
-
     if(WITH_EGL)
         mason_use(swiftshader VERSION 2018-05-31)
     endif()
diff --git a/cmake/offline.cmake b/cmake/offline.cmake
index b751125297..3fa075f07b 100644
--- a/cmake/offline.cmake
+++ b/cmake/offline.cmake
@@ -2,9 +2,6 @@ add_executable(mbgl-offline
     bin/offline.cpp
 )
 
-# args requires RTTI
-set_source_files_properties(bin/offline.cpp PROPERTIES COMPILE_OPTIONS "-frtti")
-
 target_sources(mbgl-offline
     PRIVATE platform/default/include/mbgl/util/default_styles.hpp
 )
@@ -15,10 +12,9 @@ target_include_directories(mbgl-offline
 
 target_link_libraries(mbgl-offline
     PRIVATE mbgl-core
+    PRIVATE args
 )
 
-target_add_mason_package(mbgl-offline PRIVATE args)
-
 mbgl_platform_offline()
 
 create_source_groups(mbgl-offline)
diff --git a/cmake/render.cmake b/cmake/render.cmake
index 776c859bad..a625b3f21f 100644
--- a/cmake/render.cmake
+++ b/cmake/render.cmake
@@ -2,19 +2,15 @@ add_executable(mbgl-render
     bin/render.cpp
 )
 
-# args requires RTTI
-set_source_files_properties(bin/render.cpp PROPERTIES COMPILE_OPTIONS "-frtti")
-
 target_include_directories(mbgl-render
     PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-render
     PRIVATE mbgl-core
+    PRIVATE args
 )
 
-target_add_mason_package(mbgl-render PRIVATE args)
-
 mbgl_platform_render()
 
 create_source_groups(mbgl-render)
diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake
index ddeefad76d..7aac53e4cb 100644
--- a/cmake/vendor.cmake
+++ b/cmake/vendor.cmake
@@ -29,5 +29,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/vector-tile.cmake)
 include(${CMAKE_SOURCE_DIR}/vendor/wagyu.cmake)
 
 if(MBGL_PLATFORM STREQUAL "linux" OR MBGL_PLATFORM STREQUAL "macos")
+    include(${CMAKE_SOURCE_DIR}/vendor/args.cmake)
     include(${CMAKE_SOURCE_DIR}/vendor/glfw.cmake)
 endif()
diff --git a/platform/glfw/main.cpp b/platform/glfw/main.cpp
index 77585718e1..c27e5fe8ce 100644
--- a/platform/glfw/main.cpp
+++ b/platform/glfw/main.cpp
@@ -10,7 +10,7 @@
 #include <mbgl/style/style.hpp>
 #include <mbgl/renderer/renderer.hpp>
 
-#include <args/args.hxx>
+#include <args.hxx>
 
 #include <csignal>
 #include <fstream>
diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js
index 37e4dbc20b..760a01d87c 100755
--- a/scripts/generate-file-lists.js
+++ b/scripts/generate-file-lists.js
@@ -124,6 +124,7 @@ 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" ]);
diff --git a/vendor/args b/vendor/args
new file mode 160000
+Subproject f68b7e186cd2a020cbddfe3194c1d8ddfeeb101
diff --git a/vendor/args-files.json b/vendor/args-files.json
new file mode 100644
index 0000000000..c3c9bb64c6
--- /dev/null
+++ b/vendor/args-files.json
@@ -0,0 +1,8 @@
+{
+    "//": "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": {}
+}
diff --git a/vendor/args.cmake b/vendor/args.cmake
new file mode 100644
index 0000000000..b5839943c2
--- /dev/null
+++ b/vendor/args.cmake
@@ -0,0 +1,5 @@
+add_library(args INTERFACE)
+
+target_include_directories(args SYSTEM INTERFACE
+    ${CMAKE_SOURCE_DIR}/vendor/args
+)