From 00d5f159b16755a56964a52531e44bf54961c08f Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 2 Feb 2022 04:27:53 -0600 Subject: [PATCH] CMake: FindHDF5.cmake - remove workaround --- cmake/configure/configure_hdf5.cmake | 4 ++-- cmake/modules/FindHDF5.cmake | 21 +-------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/cmake/configure/configure_hdf5.cmake b/cmake/configure/configure_hdf5.cmake index 0a67ddc43c..d04c6fc8ec 100644 --- 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 6438e42592..f92c4a15d4 100644 --- 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}") -- 2.39.5