summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-10-15 11:19:31 -0400
committerBrad King <brad.king@kitware.com>2019-10-15 11:19:31 -0400
commitc89794feaeec7c7acd22caee9c20252bfc7b33d9 (patch)
tree5c734247245b54bca1632b6e5847da14ca4c1d98
parent4041f6a3273f5638c28c7c9ff48f0326088531c7 (diff)
parent08f4b5dcf9243754a3b6f88fc61d0c99578b08f6 (diff)
downloadcmake-c89794feaeec7c7acd22caee9c20252bfc7b33d9.tar.gz
Merge branch 'FindHDF5-cray' into release-3.16
Merge-request: !3918
-rw-r--r--Modules/FindHDF5.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 08863c8673..b4884185d9 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -761,7 +761,7 @@ mark_as_advanced( HDF5_DIFF_EXECUTABLE )
if( NOT HDF5_FOUND )
# seed the initial lists of libraries to find with items we know we need
set(HDF5_C_LIBRARY_NAMES hdf5)
- set(HDF5_C_HL_LIBRARY_NAMES hdf5_hl)
+ set(HDF5_C_HL_LIBRARY_NAMES hdf5_hl ${HDF5_C_LIBRARY_NAMES} )
set(HDF5_CXX_LIBRARY_NAMES hdf5_cpp ${HDF5_C_LIBRARY_NAMES})
set(HDF5_CXX_HL_LIBRARY_NAMES hdf5_hl_cpp ${HDF5_C_HL_LIBRARY_NAMES} ${HDF5_CXX_LIBRARY_NAMES})
@@ -772,7 +772,7 @@ if( NOT HDF5_FOUND )
foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS)
# find the HDF5 include directories
if("${__lang}" STREQUAL "Fortran")
- set(HDF5_INCLUDE_FILENAME hdf5.mod)
+ set(HDF5_INCLUDE_FILENAME hdf5.mod HDF5.mod)
elseif("${__lang}" STREQUAL "CXX")
set(HDF5_INCLUDE_FILENAME H5Cpp.h)
else()