Fixup

Author: dg0yt

ports/netcdf-c/dependencies.diff

@@ -1,5 +1,5 @@
 diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
-index d06a276..65e0ef7 100644
+index d06a276..fcec70f 100644
 --- a/cmake/dependencies.cmake
 +++ b/cmake/dependencies.cmake
 @@ -134,7 +134,22 @@ if(USE_HDF5)
@@ -34,11 +34,10 @@ index d06a276..65e0ef7 100644
    )
 
    find_package(Threads)
-@@ -244,10 +258,11 @@ if( NETCDF_ENABLE_DAP2 OR NETCDF_ENABLE_DAP4 OR NETCDF_ENABLE_BYTERANGE_SUPPORT
+@@ -244,10 +258,10 @@ if( NETCDF_ENABLE_DAP2 OR NETCDF_ENABLE_DAP4 OR NETCDF_ENABLE_BYTERANGE_SUPPORT
    #    ${CURL_INCLUDE_DIRS}
    #)
    if(CURL_FOUND)
-+    set(CURL_INCLUDE_DIRS "")
 +    set(CURL_LIBRARIES "")
      set(FOUND_CURL TRUE)
      target_link_libraries(netcdf
@@ -47,7 +46,7 @@ index d06a276..65e0ef7 100644
    )
    else()
      set(FOUND_CURL FALSE)
-@@ -345,6 +360,10 @@ if(NOT WIN32)
+@@ -345,6 +359,10 @@ if(NOT WIN32)
          set(HAVE_LIBM "")
      endif()
    else(NOT HAVE_LIBM)
@@ -58,15 +57,15 @@ index d06a276..65e0ef7 100644
      message(STATUS "Found Math library: ${HAVE_LIBM}")
    endif()
  endif()
-@@ -354,6 +373,7 @@ endif()
+@@ -354,6 +372,7 @@ endif()
  ################################
  # See if we have zlib
  find_package(ZLIB)
 +set(ZLIB_LIBRARY ZLIB::ZLIB)
 
  # Define a test flag for have zlib library
  if(ZLIB_FOUND)
-@@ -370,19 +390,24 @@ endif()
+@@ -370,19 +389,24 @@ endif()
  # Zips
  ################################
  MESSAGE(STATUS "Checking for filter libraries")
@@ -97,7 +96,7 @@ index d06a276..65e0ef7 100644
  endif()
 
  # Accumulate standard filters
-@@ -412,7 +437,8 @@ endif()
+@@ -412,7 +436,8 @@ endif()
 
  set(STD_FILTERS "${STD_FILTERS}${FOUND_STD_FILTERS}")
  IF (NETCDF_ENABLE_NCZARR_ZIP)

ports/netcdf-c/portfile.cmake

@@ -30,10 +30,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         zstd        NETCDF_ENABLE_FILTER_ZSTD
     )
 
-if(NOT NETCDF_ENABLE_DAP AND NOT NETCDF_ENABLE_NCZARR)
-    list(APPEND FEATURE_OPTIONS "-DVCPKG_LOCK_FIND_PACKAGE_CURL=OFF")
-else()
+if(NETCDF_ENABLE_DAP OR NETCDF_ENABLE_NCZARR)
     list(APPEND FEATURE_OPTIONS "-DVCPKG_LOCK_FIND_PACKAGE_CURL=ON")
+else()
+    list(APPEND FEATURE_OPTIONS "-DVCPKG_LOCK_FIND_PACKAGE_CURL=OFF")
 endif()
 
 if(VCPKG_TARGET_IS_UWP)

scripts/ci.feature.baseline.txt

@@ -1980,11 +1980,11 @@ vsgxchange:arm64-uwp = cascade
 vsgxchange:x64-linux = cascade
 vsgxchange:x64-uwp = cascade
 vsgxchange:x86-windows = cascade
+vtk[all]:x64-windows-static = cascade  # hdf5[parallel] only supports !staticcrt
 vtk[all](android) = cascade
 vtk[all](arm64 & windows) = cascade # vtk-m[core] only supports !x86 & !uwp & !(arm & windows)
 vtk[all](osx) = cascade
 vtk[all](uwp) = cascade
-vtk[all]:x64-windows-static = cascade  # hdf5[parallel] only supports !staticcrt
 vtk[all,cuda,mpi,vtkm]:x86-windows = cascade
 vtk[cuda](arm64 & windows) = cascade # cuda[core] only supports (windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)
 vtk[cuda](osx) = cascade

versions/n-/netcdf-c.json

@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "0ba8bd1a28a8a053fa9f97bb006a8750a20082db",
+      "git-tree": "0a6b5563c639916b6cd55a18bb093f13915f24ad",
       "version": "4.9.3",
       "port-version": 0
     },