From c397fd853c8f5743385cc28596d0c7d261d2d1b6 Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Mon, 25 Mar 2019 17:47:10 +0200
Subject: [core] Bump args to 6.2.2 (does not use RTTI)

---
 cmake/glfw.cmake               | 6 +-----
 cmake/mason-dependencies.cmake | 3 ---
 cmake/offline.cmake            | 6 +-----
 cmake/render.cmake             | 6 +-----
 cmake/vendor.cmake             | 1 +
 5 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'cmake')

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()
-- 
cgit v1.2.1