CMake: FindHDF5.cmake - remove workaround

diff --git a/cmake/configure/configure_hdf5.cmake b/cmake/configure/configure_hdf5.cmake
index 0a67ddc43c2838689d1c5080748308044a408f8e..d04c6fc8ec21ad2a4dc0b9b3d24346ad2147c6e5 100644 (file)
--- a/cmake/configure/configure_hdf5.cmake
+++ b/cmake/configure/configure_hdf5.cmake
@@ -26,8 +26,8 @@ MACRO(FEATURE_HDF5_FIND_EXTERNAL var)
   IF(HDF5_FOUND)
     SET(${var} TRUE)
 
-    IF( (HDF5_WITH_MPI AND NOT DEAL_II_WITH_MPI) OR
-        (NOT HDF5_WITH_MPI AND DEAL_II_WITH_MPI) )
+    IF( (HDF5_IS_PARALLEL AND NOT DEAL_II_WITH_MPI) OR
+        (NOT HDF5_IS_PARALLEL AND DEAL_II_WITH_MPI) )
       MESSAGE(STATUS "Insufficient hdf5 installation found: "
         "hdf5 has to be configured with the same MPI configuration as deal.II."
         )

diff --git a/cmake/modules/FindHDF5.cmake b/cmake/modules/FindHDF5.cmake
index 6438e425927217e46b1762ef82139c9edab014e3..f92c4a15d4afe3a403e40f9f52a06147513fc3c3 100644 (file)
--- a/cmake/modules/FindHDF5.cmake
+++ b/cmake/modules/FindHDF5.cmake
@@ -20,7 +20,7 @@
 #
 #   HDF5_LIBRARIES
 #   HDF5_INCLUDE_DIRS
-#   HDF5_WITH_MPI
+#   HDF5_IS_PARALLEL
 #
 
 SET(HDF5_DIR "" CACHE PATH "An optional hint to an hdf5 directory")
@@ -41,25 +41,6 @@ FIND_PACKAGE(HDF5)
 
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules/)
 
-IF(HDF5_FOUND)
-  #
-  # Is hdf5 compiled with support for mpi?
-  #
-  DEAL_II_FIND_FILE(HDF5_PUBCONF NAMES H5pubconf.h H5pubconf-64.h
-    HINTS ${HDF5_INCLUDE_DIRS}
-    PATH_SUFFIXES
-    )
-  FILE(STRINGS ${HDF5_PUBCONF} HDF5_MPI_STRING
-    REGEX "#define.*H5_HAVE_PARALLEL 1"
-    )
-  IF("${HDF5_MPI_STRING}" STREQUAL "")
-    SET(HDF5_WITH_MPI FALSE)
-  ELSE()
-    SET(HDF5_WITH_MPI TRUE)
-  ENDIF()
-ENDIF()
-
-
 SET(_include_dirs "${HDF5_INCLUDE_DIRS}")
 SET(_libraries "${HDF5_LIBRARIES};${HDF5_HL_LIBRARIES}")