From e899d42bec879a648272b298b3229dd7a2708754 Mon Sep 17 00:00:00 2001 From: L-Sun Date: Thu, 17 Nov 2022 10:06:38 +0800 Subject: [PATCH] Update highfive (#1634) * update highfive * update hightfive fix HDF5 cmake config path error * fix sha256 --- packages/h/hdf5/xmake.lua | 2 +- packages/h/highfive/xmake.lua | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/h/hdf5/xmake.lua b/packages/h/hdf5/xmake.lua index c24347fdf..ffd94d413 100644 --- a/packages/h/hdf5/xmake.lua +++ b/packages/h/hdf5/xmake.lua @@ -34,7 +34,7 @@ package("hdf5") table.insert(configs, "-DBUILD_STATIC_LIBS=" .. (package:config("shared") and "OFF" or "ON")) table.insert(configs, "-DHDF5_BUILD_CPP_LIB=" .. (package:config("cpplib") and "ON" or "OFF")) import("package.tools.cmake").install(package, configs) - package:addenv("HDF5_ROOT", path.join(package:installdir("share"), "cmake")) + package:addenv("HDF5_ROOT", path.join(package:installdir("cmake"))) package:addenv("PATH", package:installdir("bin")) end) diff --git a/packages/h/highfive/xmake.lua b/packages/h/highfive/xmake.lua index 5f587b249..934a71d68 100644 --- a/packages/h/highfive/xmake.lua +++ b/packages/h/highfive/xmake.lua @@ -6,8 +6,10 @@ package("highfive") add_urls("https://github.com/BlueBrain/HighFive/archive/refs/tags/$(version).tar.gz", "https://github.com/BlueBrain/HighFive.git") + add_versions("v2.6.1", "b5002c1221cf1821e02fb2ab891b0160bac88b43f56655bd844a472106ca3397") add_versions("v2.3.1", "41728a1204bdfcdcef8cbc3ddffe5d744c5331434ce3dcef35614b831234fcd7") + add_patches("v2.6.1", path.join(os.scriptdir(), "patches", "fix-find-hdf5.patch"), "6a37e12f1796394d7691b36561829bf220336ec42a736c103509ac93537a36c9") add_patches("v2.3.1", path.join(os.scriptdir(), "patches", "fix-find-hdf5.patch"), "6a37e12f1796394d7691b36561829bf220336ec42a736c103509ac93537a36c9") add_deps("cmake")