From 9da2893e423ba686227ecb0ff2db12394c768cde Mon Sep 17 00:00:00 2001 From: maier Date: Fri, 19 Oct 2012 22:16:58 +0000 Subject: [PATCH] Bugfix: Only try to read a hdf5 header if hdf5 is actually found. git-svn-id: https://svn.dealii.org/branches/branch_cmake@27147 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/modules/FindHDF5.cmake | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/deal.II/cmake/modules/FindHDF5.cmake b/deal.II/cmake/modules/FindHDF5.cmake index fd96cf98f4..d50babf090 100644 --- a/deal.II/cmake/modules/FindHDF5.cmake +++ b/deal.II/cmake/modules/FindHDF5.cmake @@ -62,17 +62,6 @@ SET(HDF5_LIBRARIES ${HDF5_HL_LIBRARY} ) -# -# Is hdf5 compiled with support for mpi? -# -FILE(STRINGS "${HDF5_INCLUDE_DIR}/H5pubconf.h" 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() - IF(HDF5_FOUND) MARK_AS_ADVANCED( HDF5_DIR @@ -80,6 +69,18 @@ IF(HDF5_FOUND) HDF5_HL_LIBRARY HDF5_INCLUDE_DIR ) + + # + # Is hdf5 compiled with support for mpi? + # + FILE(STRINGS "${HDF5_INCLUDE_DIR}/H5pubconf.h" 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() + ELSE() SET(HDF5_DIR "" CACHE STRING "An optional hint to an hdf5 directory" -- 2.39.5