diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-02 13:58:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-09-02 13:58:37 (GMT) |
| commit | 72c11e590273d100c49f472afc3a7569b233ff00 (patch) | |
| tree | 26b13e9ac145739f7c0f3a6f2a09b3e7480203b2 | |
| parent | ea1e57169ccde2d9eab9c903bbd9e887080fc667 (diff) | |
| parent | f7f73df1b3e58f55178f899352b6ffa9b4b14cb6 (diff) | |
| download | CMake-72c11e590273d100c49f472afc3a7569b233ff00.zip CMake-72c11e590273d100c49f472afc3a7569b233ff00.tar.gz CMake-72c11e590273d100c49f472afc3a7569b233ff00.tar.bz2 | |
Merge topic 'FindHDF5-updates'
f7f73df1 FindHDF5: Add hdf5_hl to list of libraries to search for Fortran_HL
19e7db07 FindHDF5: Fix support for HL and Fortran_HL components
| -rw-r--r-- | Modules/FindHDF5.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 3bd6f1e..a449132 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -225,6 +225,8 @@ if( NOT HDF5_FOUND ) _HDF5_invoke_compiler( C HDF5_C_COMPILE_LINE HDF5_C_RETURN_VALUE ) _HDF5_invoke_compiler( CXX HDF5_CXX_COMPILE_LINE HDF5_CXX_RETURN_VALUE ) _HDF5_invoke_compiler( Fortran HDF5_Fortran_COMPILE_LINE HDF5_Fortran_RETURN_VALUE ) + set(HDF5_HL_COMPILE_LINE ${HDF5_C_COMPILE_LINE}) + set(HDF5_Fortran_HL_COMPILE_LINE ${HDF5_Fortran_COMPILE_LINE}) # seed the initial lists of libraries to find with items we know we need set( HDF5_C_LIBRARY_NAMES_INIT hdf5 ) @@ -232,7 +234,7 @@ if( NOT HDF5_FOUND ) set( HDF5_CXX_LIBRARY_NAMES_INIT hdf5_cpp ${HDF5_C_LIBRARY_NAMES_INIT} ) set( HDF5_Fortran_LIBRARY_NAMES_INIT hdf5_fortran ${HDF5_C_LIBRARY_NAMES_INIT} ) - set( HDF5_Fortran_HL_LIBRARY_NAMES_INIT hdf5hl_fortran + set( HDF5_Fortran_HL_LIBRARY_NAMES_INIT hdf5hl_fortran hdf5_hl ${HDF5_Fortran_LIBRARY_NAMES_INIT} ) foreach( LANGUAGE ${HDF5_LANGUAGE_BINDINGS} ) |