diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | cmake/glfw.cmake | 2 | ||||
| -rw-r--r-- | cmake/offline.cmake | 2 | ||||
| -rw-r--r-- | cmake/render-test.cmake | 2 | ||||
| -rw-r--r-- | cmake/render.cmake | 2 | ||||
| -rw-r--r-- | cmake/test.cmake | 2 | ||||
| -rw-r--r-- | cmake/vendor.cmake | 1 | ||||
| -rwxr-xr-x | scripts/generate-file-lists.js | 1 | ||||
| m--------- | vendor/args | 0 | ||||
| -rw-r--r-- | vendor/args-files.json | 8 | ||||
| -rw-r--r-- | vendor/args.cmake | 5 |
11 files changed, 5 insertions, 23 deletions
diff --git a/.gitmodules b/.gitmodules index 1c6add6472..a9bc2ccef1 100644 --- a/.gitmodules +++ b/.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 diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake index a4d9c30477..6abc93d837 100644 --- a/cmake/glfw.cmake +++ b/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() diff --git a/cmake/offline.cmake b/cmake/offline.cmake index 3fa075f07b..1f5cc60f70 100644 --- a/cmake/offline.cmake +++ b/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() diff --git a/cmake/render-test.cmake b/cmake/render-test.cmake index acb8f8bc24..552b90dd0d 100644 --- a/cmake/render-test.cmake +++ b/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 diff --git a/cmake/render.cmake b/cmake/render.cmake index a625b3f21f..e9c6d89c8e 100644 --- a/cmake/render.cmake +++ b/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() diff --git a/cmake/test.cmake b/cmake/test.cmake index 1c1d3269a7..13c3ec538b 100644 --- a/cmake/test.cmake +++ b/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 diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 79a90965f3..66fd084dfa 100644 --- a/cmake/vendor.cmake +++ b/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) diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js index 0be0aa5dd9..2f50b98b31 100755 --- a/scripts/generate-file-lists.js +++ b/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" ]); diff --git a/vendor/args b/vendor/args deleted file mode 160000 -Subproject f68b7e186cd2a020cbddfe3194c1d8ddfeeb101 diff --git a/vendor/args-files.json b/vendor/args-files.json deleted file mode 100644 index c3c9bb64c6..0000000000 --- a/vendor/args-files.json +++ /dev/null @@ -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": {} -} diff --git a/vendor/args.cmake b/vendor/args.cmake deleted file mode 100644 index b5839943c2..0000000000 --- a/vendor/args.cmake +++ /dev/null @@ -1,5 +0,0 @@ -add_library(args INTERFACE) - -target_include_directories(args SYSTEM INTERFACE - ${CMAKE_SOURCE_DIR}/vendor/args -) |