diff options
| author | Will Dicharry <wdicharry@stellarscience.com> | 2011-05-16 19:22:57 (GMT) |
|---|---|---|
| committer | Will Dicharry <wdicharry@stellarscience.com> | 2011-05-16 21:36:47 (GMT) |
| commit | 063ac873ce004ab1affe78be3fe0344a6f87cb79 (patch) | |
| tree | de271919b88551330e562ba030bac408dd364bb2 /Modules | |
| parent | 34ea17901372f02b949907662c939916b2eea453 (diff) | |
| download | CMake-063ac873ce004ab1affe78be3fe0344a6f87cb79.zip CMake-063ac873ce004ab1affe78be3fe0344a6f87cb79.tar.gz CMake-063ac873ce004ab1affe78be3fe0344a6f87cb79.tar.bz2 | |
HDF5 high level library is a find COMPONENT now.
The HDF5 high level library was originally hard coded as a dependency when the C
bindings are desired. The high level API is now requested as a COMPONENT.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindHDF5.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake index 5c500a2..878a355 100644 --- a/Modules/FindHDF5.cmake +++ b/Modules/FindHDF5.cmake @@ -10,7 +10,7 @@ # are specified, then the find module will default to finding only the HDF5 C # library. If one or more COMPONENTS are specified, the module will attempt to # find the language bindings for the specified components. The only valid -# components are C, CXX, and Fortran. If the COMPONENTS argument is not +# components are C, CXX, Fortran, and HL. If the COMPONENTS argument is not # given, the module will attempt to find only the C bindings. # # On UNIX systems, this module will read the variable HDF5_USE_STATIC_LIBRARIES @@ -33,6 +33,7 @@ # HDF5_C_LIBRARIES - Required libraries for the HDF5 C bindings. # HDF5_CXX_LIBRARIES - Required libraries for the HDF5 C++ bindings # HDF5_Fortran_LIBRARIES - Required libraries for the HDF5 Fortran bindings +# HDF5_HL_LIBRARIES - Required libraries for the HDF5 high level API # HDF5_LIBRARIES - Required libraries for all requested bindings # HDF5_FOUND - true if HDF5 was found on the system # HDF5_LIBRARY_DIRS - the full set of library directories @@ -65,6 +66,7 @@ set( HDF5_VALID_COMPONENTS C CXX Fortran + HL ) # try to find the HDF5 wrapper compilers @@ -185,7 +187,8 @@ else() endif() # seed the initial lists of libraries to find with items we know we need - set( HDF5_C_LIBRARY_NAMES_INIT hdf5_hl hdf5 ) + set( HDF5_C_LIBRARY_NAMES_INIT hdf5 ) + set( HDF5_HL_LIBRARY_NAMES_INIT hdf5_hl ${HDF5_C_LIBRARY_NAMES_INIT} ) 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} ) @@ -234,7 +237,9 @@ else() ${HDF5_${LANGUAGE}_LIBRARY_NAMES} ) # find the HDF5 libraries + message( STATUS "FindHDF5 -- search for ${LANGUAGE}" ) foreach( LIB ${HDF5_${LANGUAGE}_LIBRARY_NAMES} ) + message( STATUS "FindHDF5 -- Searching for ${LIB}" ) if( UNIX AND HDF5_USE_STATIC_LIBRARIES ) # According to bug 1643 on the CMake bug tracker, this is the # preferred method for searching for a static library. |