diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-16 13:43:04 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-16 13:43:12 (GMT) |
| commit | 2e133ca30b46d0d189d4ced92d2794e2fccf78db (patch) | |
| tree | 49d68391e867da964fd91438b2d96f7310e635f7 /Modules | |
| parent | 220d5995076f794e222c882963fb634169a6600b (diff) | |
| parent | 08f4b5dcf9243754a3b6f88fc61d0c99578b08f6 (diff) | |
| download | CMake-2e133ca30b46d0d189d4ced92d2794e2fccf78db.zip CMake-2e133ca30b46d0d189d4ced92d2794e2fccf78db.tar.gz CMake-2e133ca30b46d0d189d4ced92d2794e2fccf78db.tar.bz2 | |
Merge topic 'FindHDF5-cray'
08f4b5dcf9 FindHDF5: Append hdf5 to hdf5_hl to avoid undefined references
cd6f0ef35a FindHDF5: Cray HDF5 Fortran module filename is usually capitalized
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3918
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindHDF5.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 08863c8..b488418 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() |