[build] Replace geometry.hpp/variant with mapbox-base
This commit is contained in:
9
.gitmodules
vendored
9
.gitmodules
vendored
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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: |
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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")
|
||||
|
||||
|
||||
@@ -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" ]);
|
||||
|
||||
1
vendor/geometry.hpp
vendored
1
vendor/geometry.hpp
vendored
Submodule vendor/geometry.hpp deleted from c83a2ab18a
22
vendor/geometry.hpp-files.json
vendored
22
vendor/geometry.hpp-files.json
vendored
@@ -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": {}
|
||||
}
|
||||
5
vendor/geometry.hpp.cmake
vendored
5
vendor/geometry.hpp.cmake
vendored
@@ -1,5 +0,0 @@
|
||||
add_library(geometry.hpp INTERFACE)
|
||||
|
||||
target_include_directories(geometry.hpp SYSTEM INTERFACE
|
||||
${CMAKE_SOURCE_DIR}/vendor/geometry.hpp/include
|
||||
)
|
||||
1
vendor/mapbox-base
vendored
Submodule
1
vendor/mapbox-base
vendored
Submodule
Submodule vendor/mapbox-base added at 5a24532b93
28
vendor/mapbox-base-files.json
vendored
Normal file
28
vendor/mapbox-base-files.json
vendored
Normal file
@@ -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": {}
|
||||
}
|
||||
1
vendor/variant
vendored
1
vendor/variant
vendored
Submodule vendor/variant deleted from cb02ad487e
13
vendor/variant-files.json
vendored
13
vendor/variant-files.json
vendored
@@ -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": {}
|
||||
}
|
||||
5
vendor/variant.cmake
vendored
5
vendor/variant.cmake
vendored
@@ -1,5 +0,0 @@
|
||||
add_library(variant INTERFACE)
|
||||
|
||||
target_include_directories(variant SYSTEM INTERFACE
|
||||
${CMAKE_SOURCE_DIR}/vendor/variant/include
|
||||
)
|
||||
Reference in New Issue
Block a user