Merge branch 'backport-FindHDF5-optional-no-config' into FindHDF5-optional-no-config

This commit is contained in:
Brad King
2017-03-21 13:12:16 -04:00

View File

@@ -101,6 +101,9 @@
#
# ``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>.
@@ -401,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}