tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Bump args to 6.2.2 (does not use RTTI)

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2019-03-25 17:47:10 +02:00
parent 419bfbe0eb
commit c397fd853c
13 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -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

2
bin/offline.cpp
View File

@@ -5,7 +5,7 @@
#include <mbgl/storage/default_file_source.hpp>
#include <args/args.hxx>
#include <args.hxx>
#include <cstdlib>
#include <iostream>

2
bin/render.cpp
View File

@@ -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>

6
cmake/glfw.cmake
View File

@@ -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)

3
cmake/mason-dependencies.cmake
View File

@@ -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()

6
cmake/offline.cmake
View File

@@ -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)

6
cmake/render.cmake
View File

@@ -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)

1
cmake/vendor.cmake
View File

@@ -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()

2
platform/glfw/main.cpp
View File

@@ -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>

1
scripts/generate-file-lists.js
View File

@@ -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" ]);

1
vendor/args vendored Submodule

Submodule vendor/args added at f68b7e186c

8
vendor/args-files.json vendored Normal file
View File

@@ -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": {}
}

5
vendor/args.cmake vendored Normal file
View File

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