[Cmake-commits] CMake branch, next, updated. v3.2.2-2705-g10da37a

[Brad King]

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  10da37a3b26a699b3f501057b8657735a8c2a533 (commit)
       via  daa2cea6bf30161ac41157db26edf98c05d2e79c (commit)
      from  83449832ed0c7c52987d734abc55ddbcb5ede991 (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=10da37a3b26a699b3f501057b8657735a8c2a533
commit 10da37a3b26a699b3f501057b8657735a8c2a533
Merge: 8344983 daa2cea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 13 09:56:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 13 09:56:25 2015 -0400

    Merge topic 'FindHDF5-version-support' into next
    
    daa2cea6 fixup! FindHDF5: Add version support


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=daa2cea6bf30161ac41157db26edf98c05d2e79c
commit daa2cea6bf30161ac41157db26edf98c05d2e79c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 13 09:56:06 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 13 09:56:06 2015 -0400

    fixup! FindHDF5: Add version support

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index b4f4399..3bd6f1e 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -339,8 +339,9 @@ if( NOT HDF5_FOUND )
     set( HDF5_IS_PARALLEL FALSE )
     set( HDF5_VERSION "" )
     foreach( _dir IN LISTS HDF5_INCLUDE_DIRS )
-        if( EXISTS "${_dir}/H5pubconf.h" )
-            file( STRINGS "${_dir}/H5pubconf.h"
+      foreach(_hdr "${_dir}/H5pubconf.h" "${_dir}/H5pubconf-64.h" "${_dir}/H5pubconf-32.h")
+        if( EXISTS "${_hdr}" )
+            file( STRINGS "${_hdr}"
                 HDF5_HAVE_PARALLEL_DEFINE
                 REGEX "HAVE_PARALLEL 1" )
             if( HDF5_HAVE_PARALLEL_DEFINE )
@@ -348,7 +349,7 @@ if( NOT HDF5_FOUND )
             endif()
             unset(HDF5_HAVE_PARALLEL_DEFINE)
 
-            file( STRINGS "${_dir}/H5pubconf.h"
+            file( STRINGS "${_hdr}"
                 HDF5_VERSION_DEFINE
                 REGEX "^[ \t]*#[ \t]*define[ \t]+H5_VERSION[ \t]+" )
             if( "${HDF5_VERSION_DEFINE}" MATCHES
@@ -357,6 +358,7 @@ if( NOT HDF5_FOUND )
             endif()
             unset(HDF5_VERSION_DEFINE)
         endif()
+      endforeach()
     endforeach()
     set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL
         "HDF5 library compiled with parallel IO support" )

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

Summary of changes:
 Modules/FindHDF5.cmake |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake