diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-01-29 04:23:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 19:23:57 -0800 |
| commit | eb044d1eb5250a79c94c86f6157e034627f7628b (patch) | |
| tree | 591c88640d8ee5ef61f1d3e417db9b639651e7b0 /ports/opencv4/0011-devendor-quirc.patch | |
| parent | 2eece71f53de6f9a83d2b686b8adceb40100a134 (diff) | |
| download | vcpkg-eb044d1eb5250a79c94c86f6157e034627f7628b.tar.gz vcpkg-eb044d1eb5250a79c94c86f6157e034627f7628b.zip | |
[OpenCV] bump to 4.5.1 and to 3.4.13 (#15859)
* [OpenCV] bump to 4.5.1 and to 3.4.13
* [OpenCV] fix patches
* [OpenCV] fix hdf5 integration
* [OpenCV] devendor quirc
* fix quirc for downstream ports
* [quirc] fix target export
* update version refs
* [OpenMVG] fix regressions with new opencv
* update version refs
* fix quirc mismatch
* update version refs
Diffstat (limited to 'ports/opencv4/0011-devendor-quirc.patch')
| -rw-r--r-- | ports/opencv4/0011-devendor-quirc.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/ports/opencv4/0011-devendor-quirc.patch b/ports/opencv4/0011-devendor-quirc.patch deleted file mode 100644 index a1f13849e..000000000 --- a/ports/opencv4/0011-devendor-quirc.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 89521b1..5ff0f01 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -772,7 +772,7 @@ if(WITH_OPENVX)
- endif()
-
- if(WITH_QUIRC)
-- add_subdirectory(3rdparty/quirc)
-+ find_package(quirc CONFIG REQUIRED)
- set(HAVE_QUIRC TRUE)
- endif()
- # ----------------------------------------------------------------------------
-diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt
-index 3fa0c5d..f4c0ad6 100644
---- a/modules/objdetect/CMakeLists.txt
-+++ b/modules/objdetect/CMakeLists.txt
-@@ -2,7 +2,5 @@ set(the_description "Object Detection")
- ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java objc python js)
-
- if(HAVE_QUIRC)
-- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR)
-- ocv_include_directories(${QUIRC_INCLUDE})
-- ocv_target_link_libraries(${the_module} quirc)
-+ ocv_target_link_libraries(${the_module} quirc::quirc)
- endif()
|