Skip to content

Commit

Permalink
Properly check for empty HDF5_VERSION in CMake
Browse files Browse the repository at this point in the history
The old test apparently invoked some weird CMake legacy behavior.
This should make the pinned HDF5 Conda version unnecessary (openPMD#1701) since
the version with missing HDF5_VERSION is correctly dealt with.
  • Loading branch information
franzpoeschel committed Dec 4, 2024
1 parent bb45720 commit f9ae099
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ endif()
string(CONCAT openPMD_HDF5_STATUS "")
# version: lower limit
if(openPMD_HAVE_HDF5)
if(HDF5_VERSION STREQUAL "")
if("${HDF5_VERSION}" STREQUAL "")
message(WARNING "HDF5_VERSION is empty. Now assuming it is 1.8.13 or newer.")
else()
if(HDF5_VERSION VERSION_LESS 1.8.13)
Expand Down
2 changes: 1 addition & 1 deletion conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
- dask
- doxygen
- git
- hdf5=1.14.1=mpi_openmpi_*
- hdf5=*=mpi_openmpi_*
- mamba
- make
- mpi4py
Expand Down

0 comments on commit f9ae099

Please sign in to comment.