[szip, hdf5] Fix mingw import lib names, control linkage (#17941)

* Format manifest, make port version explicit

* Use standard mingw import lib names

* Choose either static or shared binaries

* Insert macro for dynamic linkage

* Add szip pc file

* Quote path expressions

* Port away from deprecated cmake functions

* x-add-version

* Begin of hdf5 changes

* Remove obsolete variables (complements 23eadeae)

* Fix indentation and quoting expressions

* Handle single-linkage szip configuration

* Use mingw import lib names for hdf5

* Move dependencies to Requires in pc file

* Port away from deprecated cmake functions

* x-add-version hdf5

* Apply szip review comments

* Update version

* Improve pkgconfig patch to handle lists

* Update git-tree

5 files changed, 125 insertions, 45 deletions

diff --git a/ports/hdf5/mingw-import-libs.patch b/ports/hdf5/mingw-import-libs.patch
new file mode 100644
index 000000000..f328fa1d2
--- /dev/null
+++ b/ports/hdf5/mingw-import-libs.patch
@@ -0,0 +1,30 @@
+diff -urw a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
+--- a/config/cmake_ext_mod/HDFMacros.cmake	2020-03-03 00:03:12.000000000 +0100
++++ b/config/cmake_ext_mod/HDFMacros.cmake	2021-05-12 07:56:13.703041807 +0200
+@@ -144,7 +144,7 @@
+   endif ()
+ 
+   #----- Use MSVC Naming conventions for Shared Libraries
+-  if (MINGW AND ${libtype} MATCHES "SHARED")
++  if (FALSE AND MINGW AND ${libtype} MATCHES "SHARED")
+     set_target_properties (${libtarget} PROPERTIES
+         IMPORT_SUFFIX ".lib"
+         IMPORT_PREFIX ""
+@@ -168,7 +168,7 @@
+ 
+   if (${libtype} MATCHES "SHARED")
+     if (WIN32)
+-      if (MINGW)
++      if (FALSE AND MINGW)
+         set_target_properties (${libtarget} PROPERTIES
+             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}.lib"
+             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+@@ -180,7 +180,7 @@
+         )
+       endif ()
+     else ()
+-      if (MINGW)
++      if (FALSE AND MINGW)
+         set_target_properties (${libtarget} PROPERTIES
+             IMPORTED_IMPLIB "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}.lib"
+             IMPORTED_LOCATION "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${IMPORT_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
diff --git a/ports/hdf5/pkgconfig-requires.patch b/ports/hdf5/pkgconfig-requires.patch
new file mode 100644
index 000000000..5c670b422
--- /dev/null
+++ b/ports/hdf5/pkgconfig-requires.patch
@@ -0,0 +1,51 @@
+diff -urN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2020-03-03 00:03:12.000000000 +0100
++++ b/CMakeLists.txt	2021-05-15 15:02:03.496210691 +0200
+@@ -682,6 +682,9 @@
+   if (MPI_C_LINK_FLAGS)
+     set (CMAKE_EXE_LINKER_FLAGS "${MPI_C_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}")
+   endif ()
++  if(UNIX)
++    set(ompi-c_PC_LIBS_PRIVATE ${MPI_C_LIBRARIES})
++  endif()
+ endif ()
+ 
+ #option (DEFAULT_API_VERSION "Enable v1.12 API (v16, v18, v110, v112)" "v112")
+diff -urN a/CMakeFilters.cmake b/CMakeFilters.cmake
+--- a/CMakeFilters.cmake	2020-03-03 00:03:12.000000000 +0100
++++ b/CMakeFilters.cmake	2021-05-15 12:35:58.453641554 +0200
+@@ -55,6 +55,7 @@
+         if (ZLIB_FOUND)
+           set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_LIBRARIES})
+           set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${ZLIB_LIBRARIES})
++          set (zlib_PC_LIBS_PRIVATE "${ZLIB_LIBRARIES}")
+         endif ()
+       endif ()
+     endif ()
+@@ -130,6 +131,7 @@
+     set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${SZIP_SHARED_LIBRARY})
+   endif ()
+   set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_STATIC_LIBRARY})
++  set (szip_PC_LIBS_PRIVATE "${SZIP_STATIC_LIBRARY}")
+   INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS})
+   message (STATUS "Filter SZIP is ON")
+   if (H5_HAVE_FILTER_SZIP)
+diff -urN a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt	2020-03-03 00:03:12.000000000 +0100
++++ b/src/CMakeLists.txt	2021-05-15 12:41:34.762354040 +0200
+@@ -1259,6 +1259,15 @@
+ 
+ set (_PKG_CONFIG_REQUIRES)
+ set (_PKG_CONFIG_REQUIRES_PRIVATE)
++set(_PKG_CONFIG_LIBS_PRIVATE " ${_PKG_CONFIG_LIBS_PRIVATE} ")
++foreach(_module IN ITEMS ompi-c szip zlib)
++    if(${_module}_PC_LIBS_PRIVATE)
++        foreach(_lib IN LISTS ${_module}_PC_LIBS_PRIVATE)
++            string(REPLACE " -l${_lib} " " " _PKG_CONFIG_LIBS_PRIVATE "${_PKG_CONFIG_LIBS_PRIVATE}")
++        endforeach()
++        string(APPEND _PKG_CONFIG_REQUIRES_PRIVATE " ${_module}")
++    endif()
++endforeach()
+ 
+ configure_file (
+     ${HDF_RESOURCES_DIR}/libhdf5.pc.in
diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake
index 48d4489ad..0cd1cb52c 100644
--- a/ports/hdf5/portfile.cmake
+++ b/ports/hdf5/portfile.cmake
@@ -9,8 +9,10 @@ vcpkg_from_github(
     SHA512 d84df1ea72dc6fa038440a370e1b1ff523364474e7f214b967edc26d3191b2ef4fe1d9273c4a086a5945f1ad1ab6aa8dbcda495898e7967b2b73fd93dd5071e0
     HEAD_REF develop
     PATCHES
-       hdf5_config.patch
-       szip.patch
+        hdf5_config.patch
+        szip.patch
+        mingw-import-libs.patch
+        pkgconfig-requires.patch
 )
 
 if ("parallel" IN_LIST FEATURES AND "cpp" IN_LIST FEATURES)
@@ -22,15 +24,15 @@ if ("fortran" IN_LIST FEATURE)
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-   FEATURES # <- Keyword FEATURES is required because INVERTED_FEATURES are being used
-     parallel     HDF5_ENABLE_PARALLEL
-     tools        HDF5_BUILD_TOOLS
-     cpp          HDF5_BUILD_CPP_LIB
-     szip         HDF5_ENABLE_SZIP_SUPPORT
-     szip         HDF5_ENABLE_SZIP_ENCODING
-     zlib         HDF5_ENABLE_Z_LIB_SUPPORT
-     fortran      HDF5_BUILD_FORTRAN
-     threadsafe   HDF5_ENABLE_THREADSAFE
+    FEATURES
+        parallel     HDF5_ENABLE_PARALLEL
+        tools        HDF5_BUILD_TOOLS
+        cpp          HDF5_BUILD_CPP_LIB
+        szip         HDF5_ENABLE_SZIP_SUPPORT
+        szip         HDF5_ENABLE_SZIP_ENCODING
+        zlib         HDF5_ENABLE_Z_LIB_SUPPORT
+        fortran      HDF5_BUILD_FORTRAN
+        threadsafe   HDF5_ENABLE_THREADSAFE
 )
 
 file(REMOVE "${SOURCE_PATH}/config/cmake_ext_mod/FindSZIP.cmake")#Outdated; does not find debug szip
@@ -45,11 +47,9 @@ if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
                     -DONLY_SHARED_LIBS=ON)
 endif()
 
-find_library(SZIP_RELEASE NAMES libsz libszip szip sz PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(SZIP_DEBUG NAMES libsz libszip szip sz libsz_D libszip_D szip_D sz_D szip_debug PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     PREFER_NINJA
     OPTIONS
@@ -61,10 +61,10 @@ vcpkg_configure_cmake(
         -DHDF_PACKAGE_NAMESPACE:STRING=hdf5::
 )
 
-vcpkg_install_cmake()
-
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
+
 set(debug_suffix debug)
 if(VCPKG_TARGET_IS_WINDOWS)
     set(debug_suffix D)
@@ -119,20 +119,6 @@ foreach(PC_FILE IN LISTS PKG_FILES)
     endforeach()
 endforeach()
 vcpkg_fixup_pkgconfig()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/hdf5.pc")
-    vcpkg_replace_string(
-        "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/hdf5.pc"
-        "-loptimized -l\"\${prefix}/lib/zlib.lib\" -ldebug -l\"\${prefix}/debug/lib/zlibd.lib\""
-        "-lzlib"
-    )
-endif()
-if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hdf5.pc")
-    vcpkg_replace_string(
-        "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/hdf5.pc"
-        "-loptimized -l\"\${prefix}/lib/zlib.lib\" -ldebug -l\"\${prefix}/lib/zlibd.lib\""
-        "-lzlibd"
-    )
-endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
@@ -155,7 +141,7 @@ if(FEATURES MATCHES "tools")
             endif()
             if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}")
                 file(INSTALL "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}"
-                             DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+                     DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
                 file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/${tool}${suffix}")
             endif()
         endforeach()
diff --git a/ports/hdf5/szip.patch b/ports/hdf5/szip.patch
index df0618098..9dede4247 100644
--- a/ports/hdf5/szip.patch
+++ b/ports/hdf5/szip.patch
@@ -1,13 +1,16 @@
-diff --git a/CMakeFilters.cmake b/CMakeFilters.cmake
-index 5a8956456..997bb8e81 100644
---- a/CMakeFilters.cmake	
-+++ b/CMakeFilters.cmake
-@@ -100,7 +100,7 @@ option (HDF5_ENABLE_SZIP_SUPPORT "Use SZip Filter" OFF)
- if (HDF5_ENABLE_SZIP_SUPPORT)
-   option (HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF)
-   if (NOT SZIP_USE_EXTERNAL)
--    find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
-+    find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT})
+diff -urN a/CMakeFilters.cmake b/CMakeFilters.cmake
+--- a/CMakeFilters.cmake	2021-05-15 19:07:48.160044927 +0200
++++ b/CMakeFilters.cmake	2021-05-15 19:22:56.993970332 +0200
+@@ -104,7 +104,11 @@
+     find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
      if (NOT SZIP_FOUND)
        find_package (SZIP) # Legacy find
-       if (SZIP_FOUND)
+-      if (SZIP_FOUND)
++      if (DEFINED SZIP_SHARED_LIBRARY AND NOT DEFINED SZIP_STATIC_LIBRARY)
++          set (SZIP_STATIC_LIBRARY "${SZIP_SHARED_LIBRARY}")
++      elseif (DEFINED SZIP_STATIC_LIBRARY AND NOT DEFINED SZIP_SHARED_LIBRARY)
++          set (SZIP_SHARED_LIBRARY "${SZIP_STATIC_LIBRARY}")
++      elseif (SZIP_FOUND)
+         set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
+         set (LINK_COMP_SHARED_LIBS ${LINK_COMP_SHARED_LIBS} ${SZIP_LIBRARIES})
+       endif ()
diff --git a/ports/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json
index bb8cc7bdc..1cb6985d5 100644
--- a/ports/hdf5/vcpkg.json
+++ b/ports/hdf5/vcpkg.json
@@ -1,10 +1,20 @@
 {
   "name": "hdf5",
   "version": "1.12.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "HDF5 is a data model, library, and file format for storing and managing data",
   "homepage": "https://www.hdfgroup.org/downloads/hdf5/",
   "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ],
   "default-features": [
     "szip",
     "zlib"