[Cmake-commits] [cmake-commits] wdicharry committed FindHDF5.cmake 1.7 1.8

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv31002

Modified Files:
	FindHDF5.cmake 
Log Message:
Fixed parallel HDF5 detection when HDF5_INCLUDE_DIRS has multiple items.


Index: FindHDF5.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindHDF5.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** FindHDF5.cmake	13 Nov 2009 18:09:38 -0000	1.7
--- FindHDF5.cmake	13 Nov 2009 18:25:05 -0000	1.8
***************
*** 293,299 ****
      # HDF5 was compiled with parallel IO support
      set( HDF5_IS_PARALLEL FALSE )
!     if( HDF5_INCLUDE_DIRS )
!         if( EXISTS "${HDF5_INCLUDE_DIRS}/h5pubconf.h" )
!             file( STRINGS "${HDF5_INCLUDE_DIRS}/H5pubconf.h" 
                  HDF5_HAVE_PARALLEL_DEFINE
                  REGEX "HAVE_PARALLEL 1" )
--- 293,299 ----
      # HDF5 was compiled with parallel IO support
      set( HDF5_IS_PARALLEL FALSE )
!     foreach( _dir HDF5_INCLUDE_DIRS )
!         if( EXISTS "${_dir}/h5pubconf.h" )
!             file( STRINGS "${_dir}/H5pubconf.h" 
                  HDF5_HAVE_PARALLEL_DEFINE
                  REGEX "HAVE_PARALLEL 1" )
***************
*** 302,306 ****
              endif()
          endif()
!     endif()
      set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL
          "HDF5 library compiled with parallel IO support" )
--- 302,306 ----
              endif()
          endif()
!     endforeach()
      set( HDF5_IS_PARALLEL ${HDF5_IS_PARALLEL} CACHE BOOL
          "HDF5 library compiled with parallel IO support" )