Quellcode durchsuchen

netcdf-c: fix cmake (#8083)

choyy vor 1 Woche
Ursprung
Commit
8928db2baf
2 geänderte Dateien mit 21 neuen und 1 gelöschten Zeilen
  1. 20 0
      packages/n/netcdf-c/patches/v4.9.3/deps.patch
  2. 1 1
      packages/n/netcdf-c/xmake.lua

+ 20 - 0
packages/n/netcdf-c/patches/v4.9.3/deps.patch

@@ -94,6 +94,26 @@ index 12132a7..7da27d5 100644
  #include <libxml/tree.h>
  #include "ncxml.h"
  
+diff --git a/netCDFConfig.cmake.in b/netCDFConfig.cmake.in
+index 987b2ad..32eba6d 100644
+--- a/netCDFConfig.cmake.in
++++ b/netCDFConfig.cmake.in
+@@ -40,9 +40,14 @@ set(netCDF_HAS_DAP2 @HAS_DAP2@)
+ set(netCDF_HAS_DAP4 @HAS_DAP4@)
+ set(netCDF_HAS_DISKLESS @HAS_DISKLESS@)
+ set(netCDF_HAS_MMAP @HAS_MMAP@)
++
++
++include(CMakeFindDependencyMacro)
++find_dependency(CURL)
++
+ if (netCDF_HAS_HDF4 OR netCDF_HAS_HDF5)
+   include(CMakeFindDependencyMacro)
+-  find_dependency(HDF5)
++  find_dependency(HDF5 CONFIG)
+ endif ()
+ 
+ if (@HAS_PARALLEL@)
 diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
 index fbaeb21..740bdb1 100644
 --- a/plugins/CMakeLists.txt

+ 1 - 1
packages/n/netcdf-c/xmake.lua

@@ -6,7 +6,7 @@ package("netcdf-c")
     add_urls("https://github.com/Unidata/netcdf-c/archive/refs/tags/$(version).tar.gz",
              "https://github.com/Unidata/netcdf-c.git")
     add_versions("v4.9.3", "990f46d49525d6ab5dc4249f8684c6deeaf54de6fec63a187e9fb382cc0ffdff")
-    add_patches("v4.9.3", "patches/v4.9.3/deps.patch", "a133eba3f888902cc12e2cf65dc7d463ce1f466bea4d09ad09a3d448ef952ed8")
+    add_patches("v4.9.3", "patches/v4.9.3/deps.patch", "b66fdf04a6d0d220ef14e078ca17ca09d33491f19ef408dc971c5c1fac6e7d6d")
 
     add_deps("cmake", "libcurl", "libxml2", "libzip", "zlib")
     add_deps("hdf5", {configs = {zlib = true}})