[netcdf-c/nvtt] Update to the latest version (#13674)

7 files changed, 102 insertions, 122 deletions

diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL
index 92d0439d9..9ea0d125e 100644
--- a/ports/netcdf-c/CONTROL
+++ b/ports/netcdf-c/CONTROL
@@ -1,6 +1,5 @@
 Source: netcdf-c
-Version: 4.7.3
-Port-Version: 4
+Version: 4.7.4
 Build-Depends: hdf5, curl
 Homepage: https://github.com/Unidata/netcdf-c
 Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.
diff --git a/ports/netcdf-c/config-pkg-location.patch b/ports/netcdf-c/config-pkg-location.patch
index 532082ccb..13f0aeaa6 100644
--- a/ports/netcdf-c/config-pkg-location.patch
+++ b/ports/netcdf-c/config-pkg-location.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 46892ee..803ff46 100644
+index bd7c4f8..e4e92c6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1742,7 +1742,9 @@ FILE(COPY ${netCDF_SOURCE_DIR}/include/netcdf_meta.h
+@@ -2050,7 +2050,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ncdap_test/pingurl.c ${CMAKE_CURRENT_
  # Create CMake package configuration files. With these, other packages using
  # cmake should be able to find netcdf using find_package and find_library.
  # The EXPORT call is paired with one in liblib.
diff --git a/ports/netcdf-c/fix-dependency-libmath.patch b/ports/netcdf-c/fix-dependency-libmath.patch
index 0db00ccaf..d6b4c214e 100644
--- a/ports/netcdf-c/fix-dependency-libmath.patch
+++ b/ports/netcdf-c/fix-dependency-libmath.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 35c694f..e2c03e5 100644
+index bd7c4f8..03b7ccf 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -839,7 +839,7 @@ ENDIF()
+@@ -866,7 +866,7 @@ ENDIF()
  
  # Check for the math library so it can be explicitly linked.
  IF(NOT WIN32)
diff --git a/ports/netcdf-c/mpi.patch b/ports/netcdf-c/mpi.patch
deleted file mode 100644
index 64027e65c..000000000
--- a/ports/netcdf-c/mpi.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 101f97719..b070121b8 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -1004,6 +1004,8 @@ IF(ENABLE_PARALLEL4 AND ENABLE_NETCDF_4)

-     IF(MSVC)

-       FIND_PACKAGE(MPI REQUIRED)

-       INCLUDE_DIRECTORIES(${MPI_C_INCLUDE_PATH})

-+      list(APPEND CMAKE_REQUIRED_LIBRARIES MPI::MPI_C)

-+      list(APPEND EXTRA_DEPS MPI::MPI_C)

-     ENDIF()

-     SET(HDF5_PARALLEL ON CACHE BOOL "")

-     SET(USE_PARALLEL ON CACHE BOOL "")

-

diff --git a/ports/netcdf-c/no-install-deps.patch b/ports/netcdf-c/no-install-deps.patch
index 3d44b383e..535a0dc08 100644
--- a/ports/netcdf-c/no-install-deps.patch
+++ b/ports/netcdf-c/no-install-deps.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e87f3de..46892ee 100644
+index bd7c4f8..95fb01c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1570,7 +1570,7 @@ ADD_SUBDIRECTORY(docs)
+@@ -1830,7 +1830,7 @@ ADD_SUBDIRECTORY(docs)
  # install them in the binary dir. Grab all of the .libs, put them
  # in the libdir.
  ##
diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake
index 4813aa5b8..167150530 100644
--- a/ports/netcdf-c/portfile.cmake
+++ b/ports/netcdf-c/portfile.cmake
@@ -1,14 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Unidata/netcdf-c
-    REF b7cd387bee8c661141fabb490f4969587c008c55 # v4.7.3
-    SHA512 a55391620fac61e4975fe62907ca21049911afce6190fc12d183d24133a32aae8cd223b97a3fe57fc82d8bdca1a7db451046e3be3c379051624d48b1f56c0332
+    REF 26fba54a58fa02af92d84441ed90b417c1d08161 # v4.7.4
+    SHA512 7144374b5bd3574ea422de07ffb30fecc4e5f560f9b46f62762cc0cce511dd33068b8df9244fe94ae3cc7b3a9bb9fe398c7e67c3e5ac2109768e5a9b984f24fb
     HEAD_REF master
     PATCHES
         no-install-deps.patch
         config-pkg-location.patch
         use_targets.patch
-        mpi.patch
         fix-dependency-libmath.patch
 )
 
@@ -51,4 +50,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
diff --git a/ports/netcdf-c/use_targets.patch b/ports/netcdf-c/use_targets.patch
index 99e50dc9d..d15ab7495 100644
--- a/ports/netcdf-c/use_targets.patch
+++ b/ports/netcdf-c/use_targets.patch
@@ -1,103 +1,99 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1ce05e0fe..7671d7b1e 100644
+index bd7c4f8..9e09cf3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -431,7 +431,6 @@ IF(NC_EXTRA_DEPS)
-     SET(EXTRA_DEPS ${EXTRA_DEPS} "${${_LIB}_DEP}")

-   ENDFOREACH()

-   MESSAGE("Extra deps: ${EXTRA_DEPS}")

--  LIST(REMOVE_DUPLICATES EXTRA_DEPS)

-   SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS})

- ENDIF()

- ###

-@@ -599,15 +599,6 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
-     # we will use a static library.  This can be toggled

-     # by explicitly modifying NC_FIND_SHARED_LIBS.

-     ##

--    IF(NC_FIND_SHARED_LIBS)

--      SET(NC_HDF5_LINK_TYPE "shared")

--      SET(NC_HDF5_LINK_TYPE_UPPER "SHARED")

--      ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)

--    ELSE(NC_FIND_SHARED_LIBS)

--      SET(NC_HDF5_LINK_TYPE "static")

--      SET(NC_HDF5_LINK_TYPE_UPPER "STATIC")

--      ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB)

--    ENDIF(NC_FIND_SHARED_LIBS)

- 

-     #####

-     # First, find the C and HL libraries.

-@@ -620,9 +620,9 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
-       SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME})

-       FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL CONFIG REQUIRED ${NC_HDF5_LINK_TYPE})

-     ELSE(MSVC)

--      FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)

-+      FIND_PACKAGE(HDF5 COMPONENTS C HL CONFIG REQUIRED)

-     ENDIF(MSVC)

--

-+    

-     ##

-     # Next, check the HDF5 version. This will inform which

-     # HDF5 variables we need to munge.

-@@ -695,6 +695,19 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
-     ENDIF()

-   ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR)

- 

-+  if(TARGET hdf5::hdf5-shared)

-+    set(HDF5_C_LIBRARY hdf5::hdf5-shared)

-+    set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared)

+@@ -430,7 +430,6 @@ IF(NC_EXTRA_DEPS)
+     SET(EXTRA_DEPS ${EXTRA_DEPS} "${${_LIB}_DEP}")
+   ENDFOREACH()
+   MESSAGE("Extra deps: ${EXTRA_DEPS}")
+-  LIST(REMOVE_DUPLICATES EXTRA_DEPS)
+   SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${EXTRA_DEPS})
+ ENDIF()
+ ###
+@@ -598,15 +597,6 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+     # we will use a static library.  This can be toggled
+     # by explicitly modifying NC_FIND_SHARED_LIBS.
+     ##
+-    IF(NC_FIND_SHARED_LIBS)
+-      SET(NC_HDF5_LINK_TYPE "shared")
+-      SET(NC_HDF5_LINK_TYPE_UPPER "SHARED")
+-      ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)
+-    ELSE(NC_FIND_SHARED_LIBS)
+-      SET(NC_HDF5_LINK_TYPE "static")
+-      SET(NC_HDF5_LINK_TYPE_UPPER "STATIC")
+-      ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB)
+-    ENDIF(NC_FIND_SHARED_LIBS)
+ 
+     #####
+     # First, find the C and HL libraries.
+@@ -619,7 +609,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+       SET(SEARCH_PACKAGE_NAME ${HDF5_PACKAGE_NAME})
+       FIND_PACKAGE(HDF5 NAMES ${SEARCH_PACKAGE_NAME} COMPONENTS C HL CONFIG REQUIRED ${NC_HDF5_LINK_TYPE})
+     ELSE(MSVC)
+-      FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
++      FIND_PACKAGE(HDF5 COMPONENTS C HL CONFIG REQUIRED)
+     ENDIF(MSVC)
+ 
+     ##
+@@ -701,6 +691,19 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+       SET(HDF5_C_LIBRARY hdf5)
+     ENDIF()
+   ENDIF(HDF5_C_LIBRARY AND HDF5_HL_LIBRARY AND HDF5_INCLUDE_DIR)
++  
++  if(TARGET hdf5::hdf5-shared)
++    set(HDF5_C_LIBRARY hdf5::hdf5-shared)
++    set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-shared)
 +    set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-shared)
-+    ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)

-+  else()

-+    set(HDF5_C_LIBRARY hdf5::hdf5-static)

-+    set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static)

++    ADD_DEFINITIONS(-DH5_BUILT_AS_DYNAMIC_LIB)
++  else()
++    set(HDF5_C_LIBRARY hdf5::hdf5-static)
++    set(HDF5_C_LIBRARY_hdf5 hdf5::hdf5-static)
 +    set(HDF5_HL_LIBRARIES hdf5::hdf5_hl-static)
-+    ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB)

-+  endif()

-+  list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY})

-+

-   FIND_PACKAGE(Threads)

- 

-   # There is a missing case in the above code so default it

-@@ -721,16 +733,11 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
-   CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS)

- 

-   #Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip.

--  CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP)

-+  set(USE_SZIP ${HDF5_ENABLE_SZIP_SUPPORT})

-   IF(USE_SZIP)

--    FIND_LIBRARY(SZIP NAMES szip sz)

--    IF(SZIP)

-+    #FIND_LIBRARY(SZIP NAMES szip sz)

-+    #IF(SZIP)

-       SET(HAVE_H5Z_SZIP 1)

--      SET(SZIP_LIBRARY ${SZIP})

--      SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP})

--    ELSE()

--      MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.")

--    ENDIF()

-   ENDIF()

- 

-   CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HAVE_H5PSET_LIBVER_BOUNDS)

-@@ -764,8 +776,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
- ENDIF(USE_HDF5 OR ENABLE_NETCDF_4)

- 

- # See if we have libcurl

--FIND_PACKAGE(CURL)

--ADD_DEFINITIONS(-DCURL_STATICLIB=1)

-+FIND_PACKAGE(CURL CONFIG)

- INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})

- 

- # Check to see if CURLOPT_USERNAME is defined.

-@@ -1890,7 +1902,6 @@ ENDIF()
- 

- STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}")

- 

--LIST(REMOVE_DUPLICATES NC_LIBS)

- LIST(REMOVE_DUPLICATES LINKFLAGS)

- 

- SET(LIBS ${NC_LIBS})

++    ADD_DEFINITIONS(-DH5_BUILT_AS_STATIC_LIB)
++  endif()
++  list(APPEND CMAKE_REQUIRED_LIBRARIES ${HDF5_C_LIBRARY})
+ 
+   FIND_PACKAGE(Threads)
+ 
+@@ -728,17 +731,9 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+   CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_all_coll_metadata_ops "" HDF5_HAS_COLL_METADATA_OPS)
+ 
+   #Check to see if H5Z_SZIP exists in HDF5_Libraries. If so, we must use szip.
+-  CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Z_SZIP "" USE_SZIP)
++  set(USE_SZIP ${HDF5_ENABLE_SZIP_SUPPORT})
+   IF(USE_SZIP)
+-    FIND_LIBRARY(SZIP NAMES szip sz)
+-    IF(SZIP)
+       SET(HAVE_H5Z_SZIP 1)
+-      SET(SZIP_LIBRARY ${SZIP})
+-      SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${SZIP})
+-      MESSAGE(STATUS "HDF5 has szip.")
+-    ELSE()
+-      MESSAGE(FATAL_ERROR "HDF5 Requires SZIP, but cannot find libszip or libsz.")
+-    ENDIF()
+   ENDIF()
+ 
+   CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5Pset_libver_bounds "" HAVE_H5PSET_LIBVER_BOUNDS)
+@@ -788,8 +783,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+ ENDIF(USE_HDF5 OR ENABLE_NETCDF_4)
+ 
+ # See if we have libcurl
+-FIND_PACKAGE(CURL)
+-ADD_DEFINITIONS(-DCURL_STATICLIB=1)
++FIND_PACKAGE(CURL CONFIG)
+ INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIRS})
+ 
+ # Check to see if CURLOPT_USERNAME is defined.
+@@ -1893,7 +1887,6 @@ ENDIF()
+ 
+ STRING(REPLACE ";" " " LINKFLAGS "${LINKFLAGS}")
+ 
+-LIST(REMOVE_DUPLICATES NC_LIBS)
+ LIST(REMOVE_DUPLICATES LINKFLAGS)
+ 
+ SET(LIBS ${NC_LIBS})
 diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt
-index ea9b02949..ec7851f37 100644
+index ea9b029..8aeeab7 100644
 --- a/liblib/CMakeLists.txt
 +++ b/liblib/CMakeLists.txt
 @@ -58,7 +58,7 @@ ENDIF()
@@ -152,11 +148,11 @@ index ea9b02949..ec7851f37 100644
  
  TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS})
 diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in
-index c89cf3e67..b81f35a1b 100644
+index 9d68eec..b8f6113 100644
 --- a/netCDFConfig.cmake.in
 +++ b/netCDFConfig.cmake.in
 @@ -12,6 +12,10 @@ set_and_check(netCDF_LIB_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
- set(netCDF_LIBRARIES netcdf)
+ set(netCDF_LIBRARIES netCDF::netcdf)
  
  # include target information
 +include(CMakeFindDependencyMacro)