Skip to content

Commit 1346bed

Browse files
committed
build HDF5 2.1.0 if needed
1 parent e16587d commit 1346bed

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ jobs:
9292
runs-on: ${{ matrix.os }}
9393
timeout-minutes: 15
9494

95-
env:
96-
CC: gcc-14
97-
FC: gfortran-14
98-
9995
strategy:
10096
matrix:
10197
os: [ubuntu-latest, macos-latest]
@@ -105,7 +101,9 @@ jobs:
105101

106102
- name: install HDF5 (macOS)
107103
if: runner.os == 'macOS'
108-
run: brew install hdf5
104+
run: |
105+
brew install hdf5
106+
echo "FC=gfortran-15" >> $GITHUB_ENV
109107
110108
- name: install HDF5 (Linux)
111109
if: runner.os == 'Linux'

cmake/hdf5.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ if(hdf5_url MATCHES "hdf5_([0-9]+\.[0-9]+\.[0-9]+)\.")
7979
set(HDF5_VERSION "${CMAKE_MATCH_1}")
8080
elseif(hdf5_url MATCHES "hdf5-([0-9]+\_[0-9]+\_[0-9]+)")
8181
string(REPLACE "_" "." HDF5_VERSION "${CMAKE_MATCH_1}")
82+
elseif(hdf5_url MATCHES "([0-9]+\.[0-9]+\.[0-9]+)\.tar.gz")
83+
set(HDF5_VERSION "${CMAKE_MATCH_1}")
8284
else()
8385
message(FATAL_ERROR "Could not determine HDF5 version from URL: ${hdf5_url}")
8486
endif()

cmake/libraries.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
"url" : "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.3.3.tar.gz"
1010
},
1111
"hdf5": {
12-
"url": "https://github.com/HDFGroup/hdf5/releases/download/hdf5_1.14.6/hdf5-1.14.6.tar.gz"
12+
"url": "https://github.com/HDFGroup/hdf5/archive/refs/tags/2.1.0.tar.gz"
1313
}
1414
}

0 commit comments

Comments
 (0)