From: maier Date: Mon, 15 Oct 2012 20:53:18 +0000 (+0000) Subject: Cleanup X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2951b07f0e8f95bcc3b494dc453bba2b3e34e163;p=dealii-svn.git Cleanup git-svn-id: https://svn.dealii.org/branches/branch_cmake@27133 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/TODO.CMAKE b/deal.II/TODO.CMAKE index 2773ec5410..7b29068ab1 100644 --- a/deal.II/TODO.CMAKE +++ b/deal.II/TODO.CMAKE @@ -1,12 +1,14 @@ Major: +* MPI dependencies? + arpack, hdf5, petsc, p4est, trilinos, metis + * Add the rest of the Bug tests * Test the fparser 4.5 functionality. * The following features have to be written: * SLEPC - * HDF5 * TECPLOT * Write a wrapper around cmake. Something like diff --git a/deal.II/cmake/modules/FindHDF5.cmake b/deal.II/cmake/modules/FindHDF5.cmake index 08ac55da00..35d14bbbaa 100644 --- a/deal.II/cmake/modules/FindHDF5.cmake +++ b/deal.II/cmake/modules/FindHDF5.cmake @@ -19,6 +19,7 @@ # # HDF5_LIBRARIES # HDF5_INCLUDE_DIRS +# HDF5_WITH_MPI # INCLUDE(FindPackageHandleStandardArgs) @@ -55,6 +56,17 @@ 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_INCLUDE_DIR diff --git a/deal.II/cmake/modules/FindPETSC.cmake b/deal.II/cmake/modules/FindPETSC.cmake index 30a9b8c1dc..a22d4d34be 100644 --- a/deal.II/cmake/modules/FindPETSC.cmake +++ b/deal.II/cmake/modules/FindPETSC.cmake @@ -25,6 +25,7 @@ # PETSC_VERSION_MINOR # PETSC_VERSION_SUBMINOR # PETSC_VERSION_PATCH +# PETSC_WITH_MPIUNI # INCLUDE(FindPackageHandleStandardArgs)