From 801f40c6883e40792ed4dc13547dcd9c4c2e2701 Mon Sep 17 00:00:00 2001
From: Stefano Sinigardi <stesinigardi@hotmail.com>
Date: Fri, 13 Aug 2021 22:57:28 +0200
Subject: [OpenCV] update to v4.5.3 and to v3.4.15 (#18827)

* [OpenCV] update to v4.5.3 and to v3.4.15

* [OpenCV] update refs

* [libxml2] add missing find_dependency(Iconv)
[libiconv] update cmake wrapper

* [libiconv] fix hints

* [opencv4] do not require cudnn if cuda enabled

* [opencv] update refs

* [OpenCV] increase CI coverage even more

* [vcpkg-ci-opencv] trying to restore x64-uwp ci tests

* restore previous patches to avoid unnecessary modifications

* [OpenCV] fix refs

* [OpenCV] fix CMake Warning related to protobuf dependency

* [OpenCV] fix refs

* [libxml2] fix references

* [libxml2] restore previous cmake wrapper, new one is broken

* [libxml2] fix references

* bump versions

* update refs

* [libxml2] Update the format for vcpkg-cmake-wrapper.cmake

* Update versions/l-/libxml2.json

* [libxml2] update port version

* [libxml2] update refs

* [OpenCV] fix refs

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
---
 ports/libxml2/vcpkg-cmake-wrapper.cmake | 29 ++++++++---------------------
 ports/libxml2/vcpkg.json                |  2 +-
 2 files changed, 9 insertions(+), 22 deletions(-)

(limited to 'ports/libxml2')

diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake
index 6209ea464..9287c37e6 100644
--- a/ports/libxml2/vcpkg-cmake-wrapper.cmake
+++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake
@@ -9,21 +9,17 @@ endif()
 if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0}_CONFIG)
     find_package(LibLZMA)
     find_package(ZLIB)
+    find_package(Iconv)
     include(SelectLibraryConfigurations)
     find_library(LIBXML2_LIBRARY_DEBUG NAMES xml2 libxml2 xml2s libxml2s xml2d libxml2d xml2sd libxml2sd NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)
     find_library(LIBXML2_LIBRARY_RELEASE NAMES xml2 libxml2 xml2s libxml2s NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
-    find_library(ICONV_LIBRARY_DEBUG NAMES iconvd libiconvd iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_INSTALLED_DIR}/debug" NO_DEFAULT_PATH)
-    find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
-    find_library(ICONV_LIBRARY_RELEASE NAMES iconv libiconv NAMES_PER_DIR PATH_SUFFIXES lib)
-    find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
-    find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
-    find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib)
     unset(LIBXML2_LIBRARIES)
     unset(LIBXML2_LIBRARY CACHE)
     select_library_configurations(LIBXML2)
-    select_library_configurations(ICONV)
-    select_library_configurations(CHARSET)
     list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES})
+    if(Iconv_LIBRARIES)
+        list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES})
+    endif()
     if(TARGET LibXml2::LibXml2 AND LIBXML2_LIBRARY_RELEASE)
         set_target_properties(LibXml2::LibXml2 PROPERTIES IMPORTED_LOCATION_RELEASE "${LIBXML2_LIBRARY_RELEASE}")
     endif()
@@ -43,20 +39,11 @@ if(LibXml2_FOUND AND "@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static" AND NOT ${ARGV0
             target_link_libraries(LibXml2::LibXml2 INTERFACE "ws2_32")
         endif()
     endif()
-    if(ICONV_LIBRARIES)
-        list(APPEND LIBXML2_LIBRARIES ${ICONV_LIBRARIES})
-        if(TARGET LibXml2::LibXml2)
-           target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES})
-        endif()
-    endif()
-    if(CHARSET_LIBRARIES)
-        list(APPEND LIBXML2_LIBRARIES ${CHARSET_LIBRARIES})
-        if(TARGET LibXml2::LibXml2)
-           target_link_libraries(LibXml2::LibXml2 INTERFACE ${CHARSET_LIBRARIES})
-        endif()
-    endif()
     if(TARGET LibXml2::LibXml2)
-        target_link_libraries(LibXml2::LibXml2 INTERFACE ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES})
+        target_link_libraries(LibXml2::LibXml2 INTERFACE "liblzma::liblzma" "ZLIB::ZLIB")
+        if(TARGET Iconv::Iconv)
+            target_link_libraries(LibXml2::LibXml2 INTERFACE "Iconv::Iconv")
+        endif()
     endif()
     cmake_policy(POP)
 endif()
diff --git a/ports/libxml2/vcpkg.json b/ports/libxml2/vcpkg.json
index 0483b7f92..228b43572 100644
--- a/ports/libxml2/vcpkg.json
+++ b/ports/libxml2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libxml2",
   "version-semver": "2.9.12",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Libxml2 is the XML C parser and toolkit developed for the Gnome project (but usable outside of the Gnome platform).",
   "homepage": "https://xmlsoft.org/",
   "dependencies": [
-- 
cgit v1.2.3