]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Cleanup
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 15 Oct 2012 20:53:18 +0000 (20:53 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 15 Oct 2012 20:53:18 +0000 (20:53 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@27133 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/TODO.CMAKE
deal.II/cmake/modules/FindHDF5.cmake
deal.II/cmake/modules/FindPETSC.cmake

index 2773ec541015130078e38c3f30615ba2ca6953c2..7b29068ab195912886d0da4debb32e724445cd2d 100644 (file)
@@ -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
index 08ac55da00cfbcd2997d4ae8a4e28ef29bb4e043..35d14bbbaa2587c04197e3c6a81e5537abb2a87a 100644 (file)
@@ -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
index 30a9b8c1dccf660b19ed88d0adf8f77e76773442..a22d4d34bebf0bcefb36f70789da240276763301 100644 (file)
@@ -25,6 +25,7 @@
 #     PETSC_VERSION_MINOR
 #     PETSC_VERSION_SUBMINOR
 #     PETSC_VERSION_PATCH
+#     PETSC_WITH_MPIUNI
 #
 
 INCLUDE(FindPackageHandleStandardArgs)

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.