Commit 7b084982 authored by Julien Bigot's avatar Julien Bigot
Browse files

Correctly handle the case where HDF5 was already searched and not found

parent decebaf9
Pipeline #14370 passed with stages
in 16 minutes and 3 seconds
......@@ -17,8 +17,8 @@ The %PDI source distribution includes:
To download the sources, have a look at the list of all releases at
https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/releases
For example, release 1.5.3 can be downloaded from
https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/1.5.3/pdi-1.5.3.tar.bz2
For example, release 1.5.4 can be downloaded from
https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/1.5.4/pdi-1.5.4.tar.bz2
## Default installation {#default_installation}
......@@ -37,18 +37,18 @@ external dependencies are:
* a [MPI](https://www.mpi-forum.org/) 2 implementation.
\attention
This list of dependecies can be further reduced by limiting the set of features
This list of dependencies can be further reduced by limiting the set of features
compiled.
For example, release 1.5.3 can be installed by following these instructions (but
For example, release 1.5.4 can be installed by following these instructions (but
look for the latest release at
https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/releases ):
```bash
wget https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/1.5.3/pdi-1.5.3.tar.bz2
tar -xjf pdi-1.5.3.tar.bz2
mkdir pdi-1.5.3/build
cd pdi-1.5.3/build
wget https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/archive/1.5.4/pdi-1.5.4.tar.bz2
tar -xjf pdi-1.5.4.tar.bz2
mkdir pdi-1.5.4/build
cd pdi-1.5.4/build
cmake -DCMAKE_INSTALL_PREFIX="${HOME}/.local/" .. # configuration
make install # compilation and installation
```
......
......@@ -4,6 +4,13 @@ All notable changes to the Decl'HDF5 plugin will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [1.5.4] - 2022-06-11
### Fixed
* Correctly handle the case where HDF5 was already searched and not found
[#427](https://gitlab.maisondelasimulation.fr/pdidev/pdi/-/issues/427)
## [1.5.0] - 2022-03-30
### Changed
......
......@@ -514,6 +514,7 @@ if(NOT HDF5_FOUND AND NOT HDF5_NO_FIND_PACKAGE_CONFIG_FILE)
if(HDF5_FIND_DEBUG)
message(STATUS "Found HDF5 at ${HDF5_DIR} via NO_MODULE. Now trying to extract locations etc.")
endif()
unset(HDF5_IS_PARALLEL CACHE)
set(HDF5_IS_PARALLEL ${HDF5_ENABLE_PARALLEL})
set(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR})
set(HDF5_LIBRARIES)
......@@ -591,6 +592,8 @@ endif()
if(NOT HDF5_FOUND)
set(_HDF5_NEED_TO_SEARCH FALSE)
set(HDF5_COMPILER_NO_INTERROGATE TRUE)
unset(HDF5_IS_PARALLEL)
unset(HDF5_IS_PARALLEL CACHE)
# Only search for languages we've enabled
foreach(_lang IN LISTS HDF5_LANGUAGE_BINDINGS)
# First check to see if our regular compiler is one of wrappers
......@@ -965,6 +968,7 @@ if( NOT HDF5_FOUND )
# If the HDF5 include directory was found, open H5pubconf.h to determine if
# HDF5 was compiled with parallel IO support
unset(HDF5_IS_PARALLEL CACHE)
set( HDF5_IS_PARALLEL FALSE )
set( HDF5_VERSION "" )
foreach( _dir IN LISTS HDF5_INCLUDE_DIRS )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment