From 606c75812ab46bddc6e3b8fa1900506dd97a681a Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 26 Jul 2019 09:42:38 +0300 Subject: [build] Replace geometry.hpp/variant with mapbox-base --- .gitmodules | 9 ++---- appveyor.yml | 1 + circle.yml | 8 +++-- cmake/core.cmake | 3 +- cmake/vendor.cmake | 4 +-- misc/buck/mapbox-gl-native/BUCK | 3 +- scripts/generate-file-lists.js | 67 +++++++++++++++++++++-------------------- vendor/geometry.hpp | 1 - vendor/geometry.hpp-files.json | 22 -------------- vendor/geometry.hpp.cmake | 5 --- vendor/mapbox-base | 1 + vendor/mapbox-base-files.json | 28 +++++++++++++++++ vendor/variant | 1 - vendor/variant-files.json | 13 -------- vendor/variant.cmake | 5 --- 15 files changed, 77 insertions(+), 94 deletions(-) delete mode 160000 vendor/geometry.hpp delete mode 100644 vendor/geometry.hpp-files.json delete mode 100644 vendor/geometry.hpp.cmake create mode 160000 vendor/mapbox-base create mode 100644 vendor/mapbox-base-files.json delete mode 160000 vendor/variant delete mode 100644 vendor/variant-files.json delete mode 100644 vendor/variant.cmake diff --git a/.gitmodules b/.gitmodules index 486a1c8bdc..98ca7d9899 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,9 +19,6 @@ [submodule "vendor/geojson.hpp"] path = vendor/geojson.hpp url = https://github.com/mapbox/geojson.hpp.git -[submodule "vendor/geometry.hpp"] - path = vendor/geometry.hpp - url = https://github.com/mapbox/geometry.hpp.git [submodule "vendor/polylabel"] path = vendor/polylabel url = https://github.com/mapbox/polylabel.git @@ -34,9 +31,6 @@ [submodule "vendor/supercluster.hpp"] path = vendor/supercluster.hpp url = https://github.com/mapbox/supercluster.hpp.git -[submodule "vendor/variant"] - path = vendor/variant - url = https://github.com/mapbox/variant.git [submodule "vendor/vector-tile"] path = vendor/vector-tile url = https://github.com/mapbox/vector-tile.git @@ -103,3 +97,6 @@ [submodule "vendor/filesystem"] path = vendor/filesystem url = https://github.com/gulrak/filesystem.git +[submodule "vendor/mapbox-base"] + path = vendor/mapbox-base + url = https://github.com/mapbox/mapbox-base.git diff --git a/appveyor.yml b/appveyor.yml index 53970e1ac5..0e1bd01124 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -62,6 +62,7 @@ install: - git config --system core.longpaths true - git submodule sync - git submodule update --init + - git submodule foreach git submodule update --init - ps: | if (!(Test-Path cmake-3.10.1-win64-x64.zip)) { appveyor DownloadFile https://cmake.org/files/v3.10/cmake-3.10.1-win64-x64.zip diff --git a/circle.yml b/circle.yml index ba624dc251..c142d10f2b 100644 --- a/circle.yml +++ b/circle.yml @@ -477,7 +477,9 @@ jobs: - install-dependencies: { mason: false, ccache: false } - run: name: Initialize submodules - command: git submodule update --init + command: | + git submodule update --init + git submodule foreach git submodule update --init - run: name: Verify submodule pin command: scripts/nitpick/submodule-pin.js @@ -720,7 +722,9 @@ jobs: - checkout - run: name: Checkout submodules - command: git submodule update --init + command: | + git submodule update --init + git submodule foreach git submodule update --init - run: name: Build Android library command: | diff --git a/cmake/core.cmake b/cmake/core.cmake index 3278c4f7d3..7f70f65557 100644 --- a/cmake/core.cmake +++ b/cmake/core.cmake @@ -28,14 +28,13 @@ endif() # libraries in our public interface. target_link_libraries(mbgl-core PUBLIC boost + mapbox-base geojson.hpp - geometry.hpp ${ICU_LIBRARY} optional polylabel protozero rapidjson - variant vector-tile ) diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index bc1bad757f..a59c5921b3 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -12,7 +12,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/expected.cmake) include(${CMAKE_SOURCE_DIR}/vendor/filesystem.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/geojson.hpp.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/geometry.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake) include(${CMAKE_SOURCE_DIR}/vendor/jni.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/kdbush.hpp.cmake) @@ -25,11 +24,12 @@ include(${CMAKE_SOURCE_DIR}/vendor/rapidjson.cmake) include(${CMAKE_SOURCE_DIR}/vendor/shelf-pack-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/supercluster.hpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/unique_resource.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/variant.cmake) include(${CMAKE_SOURCE_DIR}/vendor/vector-tile.cmake) include(${CMAKE_SOURCE_DIR}/vendor/wagyu.cmake) include(${CMAKE_SOURCE_DIR}/vendor/args.cmake) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/vendor/mapbox-base) + if(MBGL_PLATFORM STREQUAL "linux" OR MBGL_PLATFORM STREQUAL "macos") include(${CMAKE_SOURCE_DIR}/vendor/glfw.cmake) endif() diff --git a/misc/buck/mapbox-gl-native/BUCK b/misc/buck/mapbox-gl-native/BUCK index df6a9d563a..b3dd038a83 100644 --- a/misc/buck/mapbox-gl-native/BUCK +++ b/misc/buck/mapbox-gl-native/BUCK @@ -45,9 +45,9 @@ mbgl_vendor_library("expected") mbgl_vendor_library("eternal") mbgl_vendor_library("geojson.hpp") mbgl_vendor_library("geojson-vt-cpp") -mbgl_vendor_library("geometry.hpp") mbgl_vendor_library("jni.hpp") mbgl_vendor_library("kdbush.hpp") +mbgl_vendor_library("mapbox-base") mbgl_vendor_library("sqlite") mbgl_vendor_library("optional") mbgl_vendor_library("pixelmatch-cpp") @@ -57,7 +57,6 @@ mbgl_vendor_library("rapidjson") mbgl_vendor_library("shelf-pack-cpp") mbgl_vendor_library("supercluster.hpp") mbgl_vendor_library("unique_resource") -mbgl_vendor_library("variant") mbgl_vendor_library("vector-tile") mbgl_vendor_library("wagyu") diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js index c4cf11a4c5..2138d876be 100755 --- a/scripts/generate-file-lists.js +++ b/scripts/generate-file-lists.js @@ -7,17 +7,19 @@ const xcode = require('xcode'); require('./style-code'); -const classifier = /^(?:(?:(?:platform|vendor)\/(?:[^/]+)\/|(?:test|benchmark)\/)?(?:(include|src)\/)?)?(.+\.h(?:pp|xx)?)$/; +const classifier = /^(?:(?:(?:platform|vendor)\/(?:(?!include|src).)*\/|(?:test|benchmark)\/)?(?:(include|src)\/)?)?(.+\.h(?:pp|xx)?)$/; -function generateFileList(filename, root, regex, patterns) { +function generateFileList(filename, roots, regex, patterns) { writeFileList( filename, - child_process + [].concat.apply([], roots.map(function(root) { + return child_process .execSync(`git -C ${root} ls-files ${patterns.map((p) => '"' + p + '"').join(' ')}`) .toString() .trim() .split('\n') - .map(file => path.join(root, file))); + .map(file => path.join(root, file)) + }))) } function writeFileList(filename, files) { @@ -110,13 +112,13 @@ function generateXcodeSourceList(project, target, name) { writeIfModified(`${projectPath}/${name || target}-files.json`, JSON.stringify(json, null, 4) + '\n'); } -generateFileList('src/core-files.json', '.', /^(?:src|include)\/(?:mbgl\/)?(.+)\/[^\/]+$/, +generateFileList('src/core-files.json', [ '.' ], /^(?:src|include)\/(?:mbgl\/)?(.+)\/[^\/]+$/, [ 'include/*.hpp', 'include/*.h', 'src/*.hpp', 'src/*.cpp', 'src/*.h', 'src/*.c' ]); -generateFileList('benchmark/benchmark-files.json', '.', /^benchmark\/(?:(?:src|include)\/)?(?:mbgl\/)?(?:(.+)\/)?[^\/]+$/, - [ 'benchmark/*.hpp', 'benchmark/*.cpp', 'benchmark/*.h', 'benchmark/*.c' ]); +generateFileList('benchmark/benchmark-files.json', [ '.' ], /^benchmark\/(?:(?:src|include)\/)?(?:mbgl\/)?(?:(.+)\/)?[^\/]+$/, + [ 'benchmark/*.hpp', 'benchmark/*.cpp', 'benchmark/*.host', 'benchmark/*.c' ]); -generateFileList('test/test-files.json', '.', /^test\/(?:(?:src|include)\/)?(?:mbgl\/)?(?:(.+)\/)?[^\/]+$/, +generateFileList('test/test-files.json', [ '.' ], /^test\/(?:(?:src|include)\/)?(?:mbgl\/)?(?:(.+)\/)?[^\/]+$/, [ 'test/*.hpp', 'test/*.cpp', 'test/*.h', 'test/*.c' ]); generateXcodeSourceList('platform/macos/macos.xcodeproj', 'dynamic', 'sdk'); @@ -124,28 +126,27 @@ 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" ]); -generateFileList('vendor/eternal-files.json', 'vendor/eternal', vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/expected-files.json', 'vendor/expected', vendorRegex, [ "include/expected.hpp" ]); -generateFileList('vendor/filesystem-files.json', 'vendor/filesystem', vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/geojson-vt-cpp-files.json', 'vendor/geojson-vt-cpp', vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/geojson.hpp-files.json', 'vendor/geojson.hpp', vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/geometry.hpp-files.json', 'vendor/geometry.hpp', vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/icu-files.json', 'vendor/icu', vendorRegex, [ "include/**/*.h", "src/*.h", "src/*.cpp" ]); -generateFileList('vendor/jni.hpp-files.json', 'vendor/jni.hpp', vendorRegex, [ "include/**/*.hpp", ":!:include/jni/string_conversion.hpp" ]); -generateFileList('vendor/kdbush.hpp-files.json', 'vendor/kdbush.hpp', vendorRegex, [ "include/*.hpp" ]); -generateFileList('vendor/optional-files.json', 'vendor/optional', vendorRegex, [ "optional.hpp" ]); -generateFileList('vendor/pixelmatch-cpp-files.json', 'vendor/pixelmatch-cpp', vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/polylabel-files.json', 'vendor/polylabel', vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/protozero-files.json', 'vendor/protozero', vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/rapidjson-files.json', 'vendor/rapidjson', vendorRegex, [ "include/**/*.h" ]); -generateFileList('vendor/shelf-pack-cpp-files.json', 'vendor/shelf-pack-cpp', vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/sqlite-files.json', 'vendor/sqlite', vendorRegex, [ "include/*.h", "src/*.c" ]); -generateFileList('vendor/supercluster.hpp-files.json', 'vendor/supercluster.hpp', vendorRegex, [ "include/*.hpp" ]); -generateFileList('vendor/unique_resource-files.json', 'vendor/unique_resource', vendorRegex, [ "unique_resource.hpp" ]); -generateFileList('vendor/variant-files.json', 'vendor/variant', vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/vector-tile-files.json', 'vendor/vector-tile', vendorRegex, [ "include/**/*.hpp" ]); -generateFileList('vendor/wagyu-files.json', 'vendor/wagyu', vendorRegex, [ "include/**/*.hpp" ]); +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" ]); +generateFileList('vendor/eternal-files.json', [ 'vendor/eternal' ], vendorRegex, [ "include/**/*.hpp" ]); +generateFileList('vendor/expected-files.json', [ 'vendor/expected' ], vendorRegex, [ "include/expected.hpp" ]); +generateFileList('vendor/filesystem-files.json', [ 'vendor/filesystem' ], vendorRegex, [ "include/**/*.hpp" ]); +generateFileList('vendor/geojson-vt-cpp-files.json', [ 'vendor/geojson-vt-cpp' ], vendorRegex, [ "include/**/*.hpp" ]); +generateFileList('vendor/geojson.hpp-files.json', [ 'vendor/geojson.hpp' ], vendorRegex, [ "include/**/*.hpp" ]); +generateFileList('vendor/icu-files.json', [ 'vendor/icu' ], vendorRegex, [ "include/**/*.h", "src/*.h", "src/*.cpp" ]); +generateFileList('vendor/jni.hpp-files.json', [ 'vendor/jni.hpp' ], vendorRegex, [ "include/**/*.hpp", ":!:include/jni/string_conversion.hpp" ]); +generateFileList('vendor/kdbush.hpp-files.json', [ 'vendor/kdbush.hpp' ], vendorRegex, [ "include/*.hpp" ]); +generateFileList('vendor/mapbox-base-files.json', [ 'vendor/mapbox-base/libs/geometry.hpp', 'vendor/mapbox-base/libs/variant' ], vendorRegex, [ "include/*.hpp", "include/**/*.hpp" ]); +generateFileList('vendor/optional-files.json', [ 'vendor/optional' ], vendorRegex, [ "optional.hpp" ]); +generateFileList('vendor/pixelmatch-cpp-files.json', [ 'vendor/pixelmatch-cpp' ], vendorRegex, [ "include/**/*.hpp" ]); +generateFileList('vendor/polylabel-files.json', [ 'vendor/polylabel' ], vendorRegex, [ "include/**/*.hpp" ]); +generateFileList('vendor/protozero-files.json', [ 'vendor/protozero' ], vendorRegex, [ "include/**/*.hpp" ]); +generateFileList('vendor/rapidjson-files.json', [ 'vendor/rapidjson' ], vendorRegex, [ "include/**/*.h" ]); +generateFileList('vendor/shelf-pack-cpp-files.json', [ 'vendor/shelf-pack-cpp' ], vendorRegex, [ "include/**/*.hpp" ]); +generateFileList('vendor/sqlite-files.json', [ 'vendor/sqlite' ], vendorRegex, [ "include/*.h", "src/*.c" ]); +generateFileList('vendor/supercluster.hpp-files.json', [ 'vendor/supercluster.hpp' ], vendorRegex, [ "include/*.hpp" ]); +generateFileList('vendor/unique_resource-files.json', [ 'vendor/unique_resource' ], vendorRegex, [ "unique_resource.hpp" ]); +generateFileList('vendor/vector-tile-files.json', [ 'vendor/vector-tile' ], vendorRegex, [ "include/**/*.hpp" ]); +generateFileList('vendor/wagyu-files.json', [ 'vendor/wagyu' ], vendorRegex, [ "include/**/*.hpp" ]); diff --git a/vendor/geometry.hpp b/vendor/geometry.hpp deleted file mode 160000 index c83a2ab18a..0000000000 --- a/vendor/geometry.hpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c83a2ab18a225254f128b6f5115aa39d04f2de21 diff --git a/vendor/geometry.hpp-files.json b/vendor/geometry.hpp-files.json deleted file mode 100644 index 942d372a38..0000000000 --- a/vendor/geometry.hpp-files.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js", - "sources": [], - "public_headers": { - "mapbox/feature.hpp": "vendor/geometry.hpp/include/mapbox/feature.hpp", - "mapbox/geometry.hpp": "vendor/geometry.hpp/include/mapbox/geometry.hpp", - "mapbox/geometry/box.hpp": "vendor/geometry.hpp/include/mapbox/geometry/box.hpp", - "mapbox/geometry/empty.hpp": "vendor/geometry.hpp/include/mapbox/geometry/empty.hpp", - "mapbox/geometry/envelope.hpp": "vendor/geometry.hpp/include/mapbox/geometry/envelope.hpp", - "mapbox/geometry/for_each_point.hpp": "vendor/geometry.hpp/include/mapbox/geometry/for_each_point.hpp", - "mapbox/geometry/geometry.hpp": "vendor/geometry.hpp/include/mapbox/geometry/geometry.hpp", - "mapbox/geometry/line_string.hpp": "vendor/geometry.hpp/include/mapbox/geometry/line_string.hpp", - "mapbox/geometry/multi_line_string.hpp": "vendor/geometry.hpp/include/mapbox/geometry/multi_line_string.hpp", - "mapbox/geometry/multi_point.hpp": "vendor/geometry.hpp/include/mapbox/geometry/multi_point.hpp", - "mapbox/geometry/multi_polygon.hpp": "vendor/geometry.hpp/include/mapbox/geometry/multi_polygon.hpp", - "mapbox/geometry/point.hpp": "vendor/geometry.hpp/include/mapbox/geometry/point.hpp", - "mapbox/geometry/point_arithmetic.hpp": "vendor/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp", - "mapbox/geometry/polygon.hpp": "vendor/geometry.hpp/include/mapbox/geometry/polygon.hpp", - "mapbox/geometry_io.hpp": "vendor/geometry.hpp/include/mapbox/geometry_io.hpp" - }, - "private_headers": {} -} diff --git a/vendor/geometry.hpp.cmake b/vendor/geometry.hpp.cmake deleted file mode 100644 index d97c2a9f6c..0000000000 --- a/vendor/geometry.hpp.cmake +++ /dev/null @@ -1,5 +0,0 @@ -add_library(geometry.hpp INTERFACE) - -target_include_directories(geometry.hpp SYSTEM INTERFACE - ${CMAKE_SOURCE_DIR}/vendor/geometry.hpp/include -) diff --git a/vendor/mapbox-base b/vendor/mapbox-base new file mode 160000 index 0000000000..5a24532b93 --- /dev/null +++ b/vendor/mapbox-base @@ -0,0 +1 @@ +Subproject commit 5a24532b9363f2871bc26377e7901dd87faef6d9 diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json new file mode 100644 index 0000000000..dc12c3647b --- /dev/null +++ b/vendor/mapbox-base-files.json @@ -0,0 +1,28 @@ +{ + "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js", + "sources": [], + "public_headers": { + "mapbox/feature.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/feature.hpp", + "mapbox/geometry.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry.hpp", + "mapbox/geometry/box.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/box.hpp", + "mapbox/geometry/empty.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/empty.hpp", + "mapbox/geometry/envelope.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/envelope.hpp", + "mapbox/geometry/for_each_point.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/for_each_point.hpp", + "mapbox/geometry/geometry.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/geometry.hpp", + "mapbox/geometry/line_string.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/line_string.hpp", + "mapbox/geometry/multi_line_string.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/multi_line_string.hpp", + "mapbox/geometry/multi_point.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/multi_point.hpp", + "mapbox/geometry/multi_polygon.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/multi_polygon.hpp", + "mapbox/geometry/point.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/point.hpp", + "mapbox/geometry/point_arithmetic.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp", + "mapbox/geometry/polygon.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/polygon.hpp", + "mapbox/geometry_io.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry_io.hpp", + "mapbox/optional.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/optional.hpp", + "mapbox/recursive_wrapper.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/recursive_wrapper.hpp", + "mapbox/variant.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant.hpp", + "mapbox/variant_cast.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant_cast.hpp", + "mapbox/variant_io.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant_io.hpp", + "mapbox/variant_visitor.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant_visitor.hpp" + }, + "private_headers": {} +} diff --git a/vendor/variant b/vendor/variant deleted file mode 160000 index cb02ad487e..0000000000 --- a/vendor/variant +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cb02ad487e069e050e5db11b1e5e9ccbe269e2fa diff --git a/vendor/variant-files.json b/vendor/variant-files.json deleted file mode 100644 index 28998fd4a1..0000000000 --- a/vendor/variant-files.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js", - "sources": [], - "public_headers": { - "mapbox/optional.hpp": "vendor/variant/include/mapbox/optional.hpp", - "mapbox/recursive_wrapper.hpp": "vendor/variant/include/mapbox/recursive_wrapper.hpp", - "mapbox/variant.hpp": "vendor/variant/include/mapbox/variant.hpp", - "mapbox/variant_cast.hpp": "vendor/variant/include/mapbox/variant_cast.hpp", - "mapbox/variant_io.hpp": "vendor/variant/include/mapbox/variant_io.hpp", - "mapbox/variant_visitor.hpp": "vendor/variant/include/mapbox/variant_visitor.hpp" - }, - "private_headers": {} -} diff --git a/vendor/variant.cmake b/vendor/variant.cmake deleted file mode 100644 index f4827f41c6..0000000000 --- a/vendor/variant.cmake +++ /dev/null @@ -1,5 +0,0 @@ -add_library(variant INTERFACE) - -target_include_directories(variant SYSTEM INTERFACE - ${CMAKE_SOURCE_DIR}/vendor/variant/include -) -- cgit v1.2.1