diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-22 12:50:26 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-22 12:50:31 (GMT) |
| commit | 53e2ef1bb4434081bedce3742105e378452c4c38 (patch) | |
| tree | 1ae3655c5c95880ecd7635389b76e2522441d52e /Modules | |
| parent | b5d8a6de4815ead8b342f7862cd0726b13a03a47 (diff) | |
| parent | 2c55c143c8648869ef4042bc980b55f76a51d3a9 (diff) | |
| download | CMake-53e2ef1bb4434081bedce3742105e378452c4c38.zip CMake-53e2ef1bb4434081bedce3742105e378452c4c38.tar.gz CMake-53e2ef1bb4434081bedce3742105e378452c4c38.tar.bz2 | |
Merge topic 'FindHDF5-optional-no-config'
2c55c143 Merge branch 'backport-FindHDF5-optional-no-config' into FindHDF5-optional-no-config
63c0ba5f FindHDF5: Improve HDF5_ROOT and HDF5_FIND_DEBUG documentation
9753d4c2 FindHDF5: Add option to skip finding package configuration file
2df8aa0c FindHDF5: Improve HDF5_ROOT variable documentation
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !599
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindHDF5.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index ff19866..1e2ea69 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -96,9 +96,14 @@ # # 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. # -# Set HDF5_FIND_DEBUG to true to get some extra debugging output. +# ``HDF5_FIND_DEBUG`` +# Set to a true value to get some extra debugging output. +# +# ``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>. @@ -399,7 +404,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} |