diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-30 15:45:14 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-09-02 14:09:08 +0300 |
commit | 02c9918b8399e7a312c31308007b79d322ce7708 (patch) | |
tree | 79eafe1ebea60ae9da759896369ede8785220c5d /vendor | |
parent | 899287b4ad863aed294b3547818081fa29cd2e34 (diff) | |
download | qtlocation-mapboxgl-02c9918b8399e7a312c31308007b79d322ce7708.tar.gz |
[build] Use pixelmatch-cpp from mapbox-base
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/mapbox-base-files.json | 1 | ||||
m--------- | vendor/pixelmatch-cpp | 0 | ||||
-rw-r--r-- | vendor/pixelmatch-cpp-files.json | 8 | ||||
-rw-r--r-- | vendor/pixelmatch-cpp.cmake | 5 |
4 files changed, 1 insertions, 13 deletions
diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json index 7d3a1a37aa..5cacfdcb7e 100644 --- a/vendor/mapbox-base-files.json +++ b/vendor/mapbox-base-files.json @@ -55,6 +55,7 @@ "jni/weak_reference.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/weak_reference.hpp", "jni/wrapping.hpp": "vendor/mapbox-base/mapbox/jni.hpp/include/jni/wrapping.hpp", "optional.hpp": "vendor/mapbox-base/mapbox/optional/optional.hpp", + "mapbox/pixelmatch.hpp": "vendor/mapbox-base/mapbox/pixelmatch-cpp/include/mapbox/pixelmatch.hpp", "supercluster.hpp": "vendor/mapbox-base/mapbox/supercluster.hpp/include/supercluster.hpp", "mapbox/optional.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/optional.hpp", "mapbox/recursive_wrapper.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/recursive_wrapper.hpp", diff --git a/vendor/pixelmatch-cpp b/vendor/pixelmatch-cpp deleted file mode 160000 -Subproject 61f433cb485d6b08dc7fe97ae5f8717007c7bda diff --git a/vendor/pixelmatch-cpp-files.json b/vendor/pixelmatch-cpp-files.json deleted file mode 100644 index 0e2b9caaa5..0000000000 --- a/vendor/pixelmatch-cpp-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": { - "mapbox/pixelmatch.hpp": "vendor/pixelmatch-cpp/include/mapbox/pixelmatch.hpp" - }, - "private_headers": {} -} diff --git a/vendor/pixelmatch-cpp.cmake b/vendor/pixelmatch-cpp.cmake deleted file mode 100644 index 8efa527133..0000000000 --- a/vendor/pixelmatch-cpp.cmake +++ /dev/null @@ -1,5 +0,0 @@ -add_library(pixelmatch-cpp INTERFACE) - -target_include_directories(pixelmatch-cpp SYSTEM INTERFACE - ${CMAKE_SOURCE_DIR}/vendor/pixelmatch-cpp/include -) |