diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-07-29 11:18:57 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-07-29 18:36:08 +0300 |
commit | 6f0cda8c8b8e7831f04ae5e00b13387107dcad9b (patch) | |
tree | 985607080970868ae8204cb5ef6a37b0d75bdcfc /vendor | |
parent | 41e30343f7c9772ba0a3dfa1497dd5657b18aca1 (diff) | |
download | qtlocation-mapboxgl-6f0cda8c8b8e7831f04ae5e00b13387107dcad9b.tar.gz |
[build] Use mapbox-base optional
Diffstat (limited to 'vendor')
m--------- | vendor/mapbox-base | 0 | ||||
-rw-r--r-- | vendor/mapbox-base-files.json | 1 | ||||
m--------- | vendor/optional | 0 | ||||
-rw-r--r-- | vendor/optional-files.json | 8 | ||||
-rw-r--r-- | vendor/optional.cmake | 5 |
5 files changed, 1 insertions, 13 deletions
diff --git a/vendor/mapbox-base b/vendor/mapbox-base -Subproject 5a24532b9363f2871bc26377e7901dd87faef6d +Subproject 13fa9eced82977791d814a7d549b2b6929b82b3 diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json index dc12c3647b..2e952b9661 100644 --- a/vendor/mapbox-base-files.json +++ b/vendor/mapbox-base-files.json @@ -17,6 +17,7 @@ "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", + "optional.hpp": "vendor/mapbox-base/libs/optional/optional.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", diff --git a/vendor/optional b/vendor/optional deleted file mode 160000 -Subproject f6249e7fdcb80131c390a083f1621d96023e72e diff --git a/vendor/optional-files.json b/vendor/optional-files.json deleted file mode 100644 index 4d62a8903c..0000000000 --- a/vendor/optional-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": { - "optional.hpp": "vendor/optional/optional.hpp" - }, - "private_headers": {} -} diff --git a/vendor/optional.cmake b/vendor/optional.cmake deleted file mode 100644 index f4b379d3df..0000000000 --- a/vendor/optional.cmake +++ /dev/null @@ -1,5 +0,0 @@ -add_library(optional INTERFACE) - -target_include_directories(optional SYSTEM INTERFACE - ${CMAKE_SOURCE_DIR}/vendor/optional -) |