From f9ae099e9f5e0ad911c3b8cc70f02caa1dcab34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franz=20P=C3=B6schel?= Date: Wed, 4 Dec 2024 13:18:58 +0100 Subject: [PATCH] Properly check for empty HDF5_VERSION in CMake The old test apparently invoked some weird CMake legacy behavior. This should make the pinned HDF5 Conda version unnecessary (#1701) since the version with missing HDF5_VERSION is correctly dealt with. --- CMakeLists.txt | 2 +- conda.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7627e942d..b49848c90d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/conda.yml b/conda.yml index 864749943c..e82567b2ae 100644 --- a/conda.yml +++ b/conda.yml @@ -23,7 +23,7 @@ dependencies: - dask - doxygen - git - - hdf5=1.14.1=mpi_openmpi_* + - hdf5=*=mpi_openmpi_* - mamba - make - mpi4py