[Cmake-commits] [cmake-commits] wdicharry committed FindHDF5.cmake 1.5 1.6

[cmake-commits at cmake.org]

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

Modified Files:
	FindHDF5.cmake 
Log Message:
Fixed bug in FindHDF5 caused by hdf5.h existing without H5pubconf.h.


Index: FindHDF5.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindHDF5.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -C 2 -d -r1.5 -r1.6
*** FindHDF5.cmake	28 Sep 2009 15:45:33 -0000	1.5
--- FindHDF5.cmake	29 Oct 2009 21:18:41 -0000	1.6
***************
*** 292,303 ****
      # If the HDF5 include directory was found, open H5pubconf.h to determine if
      # HDF5 was compiled with parallel IO support
      if( HDF5_INCLUDE_DIR )
!         file( STRINGS "${HDF5_INCLUDE_DIR}/H5pubconf.h" 
!             HDF5_HAVE_PARALLEL_DEFINE
!             REGEX "HAVE_PARALLEL 1" )
!         if( HDF5_HAVE_PARALLEL_DEFINE )
!             set( HDF5_IS_PARALLEL TRUE )
!         else()
!             set( HDF5_IS_PARALLEL FALSE )
          endif()
      endif()
--- 292,304 ----
      # If the HDF5 include directory was found, open H5pubconf.h to determine if
      # HDF5 was compiled with parallel IO support
+     set( HDF5_IS_PARALLEL FALSE )
      if( HDF5_INCLUDE_DIR )
!         if( EXISTS "${HDF5_INCLUDE_DIR}/h5pubconf.h" )
!             file( STRINGS "${HDF5_INCLUDE_DIR}/H5pubconf.h" 
!                 HDF5_HAVE_PARALLEL_DEFINE
!                 REGEX "HAVE_PARALLEL 1" )
!             if( HDF5_HAVE_PARALLEL_DEFINE )
!                 set( HDF5_IS_PARALLEL TRUE )
!             endif()
          endif()
      endif()