Browse Source

hdf5: fix error (#8105)

choyy 1 day ago
parent
commit
a3a394a771
2 changed files with 6 additions and 4 deletions
  1. 5 3
      packages/h/hdf5/patch/cmake.patch
  2. 1 1
      packages/h/hdf5/xmake.lua

+ 5 - 3
packages/h/hdf5/patch/cmake.patch

@@ -2,15 +2,17 @@ diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.
 index 6780101..fe5e23d 100644
 --- a/config/cmake/hdf5-config.cmake.in
 +++ b/config/cmake/hdf5-config.cmake.in
-@@ -97,6 +97,14 @@ if (${HDF5_PACKAGE_NAME}_ENABLE_THREADSAFE OR ${HDF5_PACKAGE_NAME}_ENABLE_SUBFIL
+@@ -97,6 +97,16 @@ if (${HDF5_PACKAGE_NAME}_ENABLE_THREADSAFE OR ${HDF5_PACKAGE_NAME}_ENABLE_SUBFIL
    find_package(Threads QUIET REQUIRED)
  endif ()
  
-+if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT) AND NOT ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS
++if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND NOT ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
++  include(CMakeFindDependencyMacro)
 +  find_dependency(ZLIB)
 +endif ()
 +
-+if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT) AND NOT ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS
++if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND NOT ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
++  include(CMakeFindDependencyMacro)
 +  find_dependency(libaec)
 +endif ()
 +

+ 1 - 1
packages/h/hdf5/xmake.lua

@@ -22,7 +22,7 @@ package("hdf5")
     add_versions("github:1.14.4-3", "019ac451d9e1cf89c0482ba2a06f07a46166caf23f60fea5ef3c37724a318e03")
     add_versions("github:1.14.6", "e4defbac30f50d64e1556374aa49e574417c9e72c6b1de7a4ff88c4b1bea6e9b")
 
-    add_patches(">1.10", "patch/cmake.patch", "d919e05ca15144ddf7a3c48586080860595ce08cb78411fd51e68056d4a5d366")
+    add_patches(">1.10", "patch/cmake.patch", "f1a3f6be6d1bf53a49d47b726107261f8dacf028428f9d1552fc307c03670015")
 
     add_configs("zlib", {description = "Enable Zlib Filters", default = false, type = "boolean"})
     add_configs("szip", {description = "Enable Szip Filters", default = false, type = "boolean"})