[Cmake-commits] CMake branch, next, updated. v2.8.5-1389-g9f4a135

[Will Dicharry]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9f4a135dc1050d2f01f222d1ea418882a196b7b1 (commit)
       via  ad218e435d0f25d2022dc2d7b569ad88d10dc6d1 (commit)
       via  d8c1b44790ee2d6fce56c327e639407456f6c61c (commit)
      from  d4eb84d0efba4801d3411565d96fb7a66c4481b6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f4a135dc1050d2f01f222d1ea418882a196b7b1
commit 9f4a135dc1050d2f01f222d1ea418882a196b7b1
Merge: d4eb84d ad218e4
Author:     Will Dicharry <wdicharry at stellarscience.com>
AuthorDate: Tue Aug 2 12:51:45 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 12:51:45 2011 -0400

    Merge topic 'hdf5-module-12316-fix' into next
    
    ad218e4 Added HDF5 high level Fortran bindings to available components.
    d8c1b44 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad218e435d0f25d2022dc2d7b569ad88d10dc6d1
commit ad218e435d0f25d2022dc2d7b569ad88d10dc6d1
Author:     Will Dicharry <wdicharry at stellarscience.com>
AuthorDate: Tue Aug 2 10:39:04 2011 -0600
Commit:     Will Dicharry <wdicharry at stellarscience.com>
CommitDate: Tue Aug 2 10:48:14 2011 -0600

    Added HDF5 high level Fortran bindings to available components.

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 6f01ea0..bc60638 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -10,8 +10,8 @@
 # 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, Fortran, and HL.  If the COMPONENTS argument is not
-# given, the module will attempt to find only the C bindings.
+# components are C, CXX, Fortran, HL, and Fortran_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
 # to determine whether or not to prefer a static link to a dynamic link for HDF5
@@ -34,6 +34,8 @@
 #  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_Fortran_HL_LIBRARIES - Required libraries for the high level Fortran
+#                              bindings.
 #  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
@@ -67,6 +69,7 @@ set( HDF5_VALID_COMPONENTS
     CXX
     Fortran
     HL
+    Fortran_HL
 )
 
 # Validate the list of find components.
@@ -189,6 +192,7 @@ if( NOT HDF5_FOUND )
         set( HDF5_CXX_TARGET hdf5_cpp )
         set( HDF5_HL_TARGET hdf5_hl )
         set( HDF5_Fortran_TARGET hdf5_fortran )
+        set( HDF5_Fortran_HL_TARGET hdf5_hl_fortran )
         foreach( _component ${HDF5_LANGUAGE_BINDINGS} )
             list( FIND HDF5_VALID_COMPONENTS ${_component} _component_location )
             get_target_property( _comp_location ${HDF5_${_component}_TARGET} LOCATION )
@@ -211,7 +215,10 @@ if( NOT HDF5_FOUND )
     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} )
+    set( HDF5_Fortran_LIBRARY_NAMES_INIT hdf5_fortran
+        ${HDF5_C_LIBRARY_NAMES_INIT} )
+    set( HDF5_Fortran_HL_LIBRARY_NAMES_INIT hdf5hl_fortran
+        ${HDF5_Fortran_LIBRARY_NAMES_INIT} )
     
     foreach( LANGUAGE ${HDF5_LANGUAGE_BINDINGS} )
         if( HDF5_${LANGUAGE}_COMPILE_LINE )
@@ -222,8 +229,8 @@ if( NOT HDF5_FOUND )
                 HDF5_${LANGUAGE}_LIBRARY_NAMES
             )
         
-            # take a guess that the includes may be in the 'include' sibling directory
-            # of a library directory.
+            # take a guess that the includes may be in the 'include' sibling
+            # directory of a library directory.
             foreach( dir ${HDF5_${LANGUAGE}_LIBRARY_DIRS} )
                 list( APPEND HDF5_${LANGUAGE}_INCLUDE_FLAGS ${dir}/../include )
             endforeach()
@@ -233,7 +240,7 @@ if( NOT HDF5_FOUND )
         list( APPEND HDF5_DEFINITIONS ${HDF5_${LANGUAGE}_DEFINITIONS} )
     
         # find the HDF5 include directories
-        if(${LANGUAGE} STREQUAL "Fortran")
+        if(${LANGUAGE} MATCHES "Fortran.*")
             set(HDF5_INCLUDE_FILENAME hdf5.mod)
         else()
             set(HDF5_INCLUDE_FILENAME hdf5.h)

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindHDF5.cmake            |   19 +++++++++++++------
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake