Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[hdf5] Update to 1.12.2 #24758

Merged
merged 22 commits into from
Jun 6, 2022
Merged

[hdf5] Update to 1.12.2 #24758

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6c5ab17
[hdf5] Update to 1.12.2
Thieum May 17, 2022
af01f8f
Update hdf5.json
Thieum May 17, 2022
c2eb739
add new tool to list
Thieum May 17, 2022
55fd20d
Update hdf5.json
Thieum May 17, 2022
b01944a
revert hdf5 subdir in share + special tool
Thieum May 18, 2022
aef814a
Update hdf5.json
Thieum May 18, 2022
23e9b87
add license (null -> custom license)
Thieum May 18, 2022
10125c7
formatting
Thieum May 18, 2022
3d0cfc7
Update hdf5.json
Thieum May 18, 2022
3d856db
tool is optional
Thieum May 24, 2022
d994629
Update hdf5.json
Thieum May 24, 2022
72d7605
fix guard
Thieum May 24, 2022
3f4574a
Update hdf5.json
Thieum May 24, 2022
eb62337
attempt to make hdf5perf tool dependent on feature
Thieum Jun 2, 2022
a016ed7
Update hdf5.json
Thieum Jun 2, 2022
545e733
Merge branch 'master' into hdf5-1.12.2
Thieum Jun 3, 2022
1fd3564
fix hdf5.json
Thieum Jun 3, 2022
46cc100
Update hdf5.json
Thieum Jun 3, 2022
e19ae1e
remove parallel patch per comment
Thieum Jun 3, 2022
a0d6426
Update hdf5.json
Thieum Jun 3, 2022
6bc2139
fix MATCHES vs IN_LIST
Thieum Jun 3, 2022
a2f8c54
Update hdf5.json
Thieum Jun 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ports/hdf5/hdf5_config.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ index 4d02c9c..8c10d2d 100644
#-----------------------------------------------------------------------------
if (NOT TARGET "@HDF5_PACKAGE@")
- if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
- include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
- include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
+ if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT)
+ find_dependency(ZLIB)
endif ()
- if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
- include (@PACKAGE_SHARE_INSTALL_DIR@/@SZ_PACKAGE_NAME@/@SZ_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
- include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
+ if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT)
+ find_dependency(szip)
endif ()
include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
endif ()
10 changes: 5 additions & 5 deletions ports/hdf5/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO HDFGroup/hdf5
REF hdf5-1_12_1
SHA512 8a736b6a66bf4ec904a0e0dd9e8e0e791d8a04c996c5ea6b73b7d6f8145c4bfa4ed5c6e4f11740ceb1d1226a333c8242968e604dbdac2b7b561a1bd265423434
REF hdf5-1_12_2
SHA512 8f110e035a9bd5b07687b30fb944ed72e5b6a6e0ea74ee650250f40f0d4ff81e304366a76129a50a2d37c7f4c59a57356d0d9eed18db6cb90e924c62273d17a4
HEAD_REF develop
PATCHES
hdf5_config.patch
Expand Down Expand Up @@ -91,16 +91,16 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW AND VCPKG_LIBRARY_LINKA
endforeach()
endif()

file(READ "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" contents)
file(READ "${CURRENT_PACKAGES_DIR}/share/hdf5-config.cmake" contents)
string(REPLACE [[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/bin"]]
[[${HDF5_PACKAGE_NAME}_TOOLS_DIR "${PACKAGE_PREFIX_DIR}/tools/hdf5"]]
contents ${contents}
)
file(WRITE "${CURRENT_PACKAGES_DIR}/share/hdf5/hdf5-config.cmake" ${contents})
file(WRITE "${CURRENT_PACKAGES_DIR}/share/hdf5-config.cmake" ${contents})
Thieum marked this conversation as resolved.
Show resolved Hide resolved

if(FEATURES MATCHES "tools")
set(HDF5_TOOLS h5cc h5hlcc h5c++ h5hlc++ h5copy h5diff h5dump h5ls h5stat gif2h5 h52gif h5clear h5debug
h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import
h5format_convert h5jam h5unjam h5ls h5mkgrp h5repack h5repart h5watch ph5diff h5import h5perf_serial
)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
Expand Down
3 changes: 1 addition & 2 deletions ports/hdf5/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "hdf5",
"version": "1.12.1",
"port-version": 4,
"version": "1.12.2",
"description": "HDF5 is a data model, library, and file format for storing and managing data",
"homepage": "https://www.hdfgroup.org/downloads/hdf5/",
"supports": "!uwp",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2745,8 +2745,8 @@
"port-version": 0
},
"hdf5": {
"baseline": "1.12.1",
"port-version": 4
"baseline": "1.12.2",
"port-version": 0
},
"healpix": {
"baseline": "1.12.10",
Expand Down
5 changes: 5 additions & 0 deletions versions/h-/hdf5.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ce3e47d9a7157548c3213c7c4b3d4e8a1fdbc12a",
"version": "1.12.2",
"port-version": 0
},
{
"git-tree": "1000a70aefebfdd856715d265c3421c80157b773",
"version": "1.12.1",
Expand Down