diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-21 17:09:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-21 17:09:15 (GMT) |
| commit | 10eb329e31bf76a1abf2b9b0731a33dac8037970 (patch) | |
| tree | 04e428044fcf14eeab301566f8568a3164d7d315 /Modules | |
| parent | 1356ef4f8403533118ec5855b8135091243ef3e0 (diff) | |
| parent | 9753d4c27e61f1ed90061c9a65a7a30a16062405 (diff) | |
| download | CMake-10eb329e31bf76a1abf2b9b0731a33dac8037970.zip CMake-10eb329e31bf76a1abf2b9b0731a33dac8037970.tar.gz CMake-10eb329e31bf76a1abf2b9b0731a33dac8037970.tar.bz2 | |
Merge branch 'backport-FindHDF5-optional-no-config' into release
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindHDF5.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 24a356c..2a81da6 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -89,7 +89,11 @@ # # The following variable can be set to guide the search for HDF5 libraries and includes: # -# HDF5_ROOT +# ``HDF5_ROOT`` +# Specify the path to the HDF5 installation to use. +# +# ``HDF5_NO_FIND_PACKAGE_CONFIG_FILE`` +# Set to a true value to skip trying to find ``hdf5-config.cmake``. # This module is maintained by Will Dicharry <wdicharry@stellarscience.com>. @@ -390,7 +394,7 @@ else() endif() # Try to find HDF5 using an installed hdf5-config.cmake -if(NOT HDF5_FOUND) +if(NOT HDF5_FOUND AND NOT HDF5_NO_FIND_PACKAGE_CONFIG_FILE) find_package(HDF5 QUIET NO_MODULE HINTS ${HDF5_ROOT} ${_HDF5_SEARCH_OPTS} |