mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 00:17:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4b766c1cd1
vcpkg/ports/opencv4/0008-devendor-quirc.patch

23 lines
709 B
Diff
Raw Normal View History

[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
2021-01-29 11:23:57 +08:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
[OpenCV] update to v4.5.4 and v3.4.16 (#20658) * Make gtk4.4 build. * Update baseline for gtk * Fix vcpkg version. * Fix vcpkg version. * [gtk] Fix macos build. * [gtk] Fix linux build. * [gtk] Add patches. * [gtk] Bump versions - again * Fix macos patch. * Bump versions. * [OpenCV] update to v4.5.4 and v3.4.16 * fix patches * [OpenCV] fix references * fix patches * update references * add gstreamer support * fix references * fixes * update references * Install xdamage. * Bump versions. * [fontconfig] disable doc building which is failing on bare linux * fix references * [opencv] use qt6 * [opencv2] use newer approach to downstream dependency handling * fix references * Add merged patch from upstream. * [gtk] Bump version. * [OpenCV] restore using qt5 * [opencv] force qt5 * update references * use a different strategy to find qt5 dependency for downstream projects * fix references * use a different strategy to find qt5 dependency for downstream projects also for opencv2 * fix references * [opencv2] fix patches * fix references * Update ports/fontconfig/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * fix references * fix references, again * add gtk to linux default features * fix references * [OpenCV2] fix cuda patch for newer cuda versions * fix references * [OpenCV2] add GTK feature * fix references * [opencv2] bump port version * [opencv2] fix references * Delete duplicate install of libxdamage-dev * [fontconfig] bump version * fix references * [fontconfig] bump version * fix references * move vcpkg-ci-opencv to manifest Co-authored-by: Berrysoft <Strawberry_Str@hotmail.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-12-02 11:11:01 +08:00
@@ -810,7 +810,7 @@ if(WITH_OPENVX)
[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
2021-01-29 11:23:57 +08:00
endif()
if(WITH_QUIRC)
- add_subdirectory(3rdparty/quirc)
+ find_package(quirc CONFIG REQUIRED)
set(HAVE_QUIRC TRUE)
endif()
--- a/modules/objdetect/CMakeLists.txt
+++ b/modules/objdetect/CMakeLists.txt
@@ -2,7 +2,5 @@ set(the_description "Object Detection")
[OpenCV] update to v4.5.4 and v3.4.16 (#20658) * Make gtk4.4 build. * Update baseline for gtk * Fix vcpkg version. * Fix vcpkg version. * [gtk] Fix macos build. * [gtk] Fix linux build. * [gtk] Add patches. * [gtk] Bump versions - again * Fix macos patch. * Bump versions. * [OpenCV] update to v4.5.4 and v3.4.16 * fix patches * [OpenCV] fix references * fix patches * update references * add gstreamer support * fix references * fixes * update references * Install xdamage. * Bump versions. * [fontconfig] disable doc building which is failing on bare linux * fix references * [opencv] use qt6 * [opencv2] use newer approach to downstream dependency handling * fix references * Add merged patch from upstream. * [gtk] Bump version. * [OpenCV] restore using qt5 * [opencv] force qt5 * update references * use a different strategy to find qt5 dependency for downstream projects * fix references * use a different strategy to find qt5 dependency for downstream projects also for opencv2 * fix references * [opencv2] fix patches * fix references * Update ports/fontconfig/vcpkg.json Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> * fix references * fix references, again * add gtk to linux default features * fix references * [OpenCV2] fix cuda patch for newer cuda versions * fix references * [OpenCV2] add GTK feature * fix references * [opencv2] bump port version * [opencv2] fix references * Delete duplicate install of libxdamage-dev * [fontconfig] bump version * fix references * [fontconfig] bump version * fix references * move vcpkg-ci-opencv to manifest Co-authored-by: Berrysoft <Strawberry_Str@hotmail.com> Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-12-02 11:11:01 +08:00
ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d opencv_dnn WRAP java objc python js)
[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
2021-01-29 11:23:57 +08:00
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()
Reference in New Issue Copy Permalink