diff options
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | cmake/render-test.cmake | 2 | ||||
-rw-r--r-- | cmake/test.cmake | 2 | ||||
-rw-r--r-- | cmake/vendor.cmake | 1 | ||||
-rw-r--r-- | misc/buck/mapbox-gl-native/BUCK | 1 | ||||
-rwxr-xr-x | scripts/generate-file-lists.js | 2 | ||||
-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 |
10 files changed, 4 insertions, 21 deletions
diff --git a/.gitmodules b/.gitmodules index 8d8c42911e..05ada4047c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,9 +49,6 @@ [submodule "vendor/cheap-ruler-cpp"] path = vendor/cheap-ruler-cpp url = https://github.com/mapbox/cheap-ruler-cpp.git -[submodule "vendor/pixelmatch-cpp"] - path = vendor/pixelmatch-cpp - url = https://github.com/mapbox/pixelmatch-cpp.git [submodule "vendor/glfw"] path = vendor/glfw url = https://github.com/glfw/glfw.git diff --git a/cmake/render-test.cmake b/cmake/render-test.cmake index 0da5544eaa..58546ca165 100644 --- a/cmake/render-test.cmake +++ b/cmake/render-test.cmake @@ -23,7 +23,7 @@ target_link_libraries(mbgl-render-test PRIVATE Mapbox::Base::Extras::args expected Mapbox::Base::Extras::filesystem - pixelmatch-cpp + Mapbox::Base::pixelmatch-cpp rapidjson ) diff --git a/cmake/test.cmake b/cmake/test.cmake index 13c3ec538b..3cb0ef3a72 100644 --- a/cmake/test.cmake +++ b/cmake/test.cmake @@ -28,7 +28,7 @@ target_link_libraries(mbgl-test PRIVATE mbgl-core shelf-pack-cpp unique_resource - pixelmatch-cpp + Mapbox::Base::pixelmatch-cpp ) mbgl_platform_test() diff --git a/cmake/vendor.cmake b/cmake/vendor.cmake index 7d442caf1e..47f32698bb 100644 --- a/cmake/vendor.cmake +++ b/cmake/vendor.cmake @@ -13,7 +13,6 @@ include(${CMAKE_SOURCE_DIR}/vendor/geojson-vt-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/googletest.cmake) include(${CMAKE_SOURCE_DIR}/vendor/icu.cmake) include(${CMAKE_SOURCE_DIR}/vendor/nunicode.cmake) -include(${CMAKE_SOURCE_DIR}/vendor/pixelmatch-cpp.cmake) include(${CMAKE_SOURCE_DIR}/vendor/polylabel.cmake) include(${CMAKE_SOURCE_DIR}/vendor/protozero.cmake) include(${CMAKE_SOURCE_DIR}/vendor/rapidjson.cmake) diff --git a/misc/buck/mapbox-gl-native/BUCK b/misc/buck/mapbox-gl-native/BUCK index 50acc27046..a33e2d5572 100644 --- a/misc/buck/mapbox-gl-native/BUCK +++ b/misc/buck/mapbox-gl-native/BUCK @@ -46,7 +46,6 @@ mbgl_vendor_library("eternal") mbgl_vendor_library("geojson-vt-cpp") mbgl_vendor_library("mapbox-base") mbgl_vendor_library("sqlite") -mbgl_vendor_library("pixelmatch-cpp") mbgl_vendor_library("polylabel") mbgl_vendor_library("protozero") mbgl_vendor_library("rapidjson") diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js index 9646c6fe4b..9610bbc8d0 100755 --- a/scripts/generate-file-lists.js +++ b/scripts/generate-file-lists.js @@ -136,6 +136,7 @@ generateFileList('vendor/icu-files.json', [ 'vendor/icu' ], vendorRegex, [ "incl generateFileList('vendor/mapbox-base-files.json', [ 'vendor/mapbox-base/extras/kdbush.hpp', 'vendor/mapbox-base/extras/filesystem', + 'vendor/mapbox-base/mapbox/pixelmatch-cpp', 'vendor/mapbox-base/mapbox/geometry.hpp', 'vendor/mapbox-base/mapbox/variant', 'vendor/mapbox-base/mapbox/optional', @@ -143,7 +144,6 @@ generateFileList('vendor/mapbox-base-files.json', 'vendor/mapbox-base/mapbox/geojson.hpp', 'vendor/mapbox-base/mapbox/jni.hpp' ], vendorRegex, [ "include/*.hpp", "include/**/*.hpp", "optional.hpp", ":!:include/jni/string_conversion.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" ]); 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 -) |