]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Bugfix: Search for Epetra_MpiComm.h as a check whether trilinos was build
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 18 Sep 2012 09:54:45 +0000 (09:54 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 18 Sep 2012 09:54:45 +0000 (09:54 +0000)
with mpi support

git-svn-id: https://svn.dealii.org/branches/branch_cmake@26465 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/CMakeLists.txt
deal.II/contrib/cmake/check/check_for_cxx_features.cmake
deal.II/contrib/cmake/configure/configure_trilinos.cmake
deal.II/contrib/cmake/setup_external_macros.cmake

index a3e0458d78d2e4816bc01f7b9eae88a6f474e9f2..238ef5bc965393a82a99a865daa800d34a0318f2 100644 (file)
@@ -97,7 +97,7 @@ OPTION(DEAL_II_ALLOW_CONTRIB
 
 OPTION(DEAL_II_WITH_ARPACK
   "Build deal.II with support for ARPACK."
-  ON)
+  OFF)
 
 OPTION(DEAL_II_WITH_BLAS
   "Build deal.II with support for BLAS."
index 2fd7f860ca0a5dd15eaa0c38f53247d12bdf1ec5..7056da90efd835e9f63659316da1eeb43b1f7276 100644 (file)
@@ -219,11 +219,11 @@ CHECK_CXX_SOURCE_COMPILES(
 # Checks for various header files: # TODO: Obsolete?
 #
 
-CHECK_INCLUDE_FILES("stdint.h" HAVE_STDINT_H)
-CHECK_INCLUDE_FILES("stdlib.h" HAVE_STDLIB_H)
-CHECK_INCLUDE_FILES("strings.h" HAVE_STRINGS_H)
-CHECK_INCLUDE_FILES("string.h" HAVE_STRING_H)
-CHECK_INCLUDE_FILES("sys/stat.h" HAVE_SYS_STAT_H)
-CHECK_INCLUDE_FILES("sys/syscall.h" HAVE_SYS_SYSCALL_H)
-CHECK_INCLUDE_FILES("sys/times.h" HAVE_SYS_TIMES_H)
-CHECK_INCLUDE_FILES("sys/types.h" HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILE("stdint.h" HAVE_STDINT_H)
+CHECK_INCLUDE_FILE("stdlib.h" HAVE_STDLIB_H)
+CHECK_INCLUDE_FILE("strings.h" HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE("string.h" HAVE_STRING_H)
+CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE("sys/syscall.h" HAVE_SYS_SYSCALL_H)
+CHECK_INCLUDE_FILE("sys/times.h" HAVE_SYS_TIMES_H)
+CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
index 74e7c58c82122f88cf2e33e203c92d113ba72d87..e8a93848874f1d2fd1f2c25c421273b94f82b8c5 100644 (file)
@@ -85,15 +85,21 @@ it incompatible with deal.II. Please use versions before 10.6 or after
 
     #
     # Trilinos has to be configured with the same MPI configuration as
-    # deal.II. So check this:
+    # deal.II. TODO: Refine this check...
     #
-    # TODO: Refine this check...
+
     #
-    IF(NOT "${Trilinos_MPI_EXEC}" EQUAL "")
-      SET(TRILINOS_USE_MPI TRUE)
-    ENDIF()
-    IF( (TRILINOS_USE_MPI AND NOT DEAL_II_COMPILER_SUPPORTS_MPI) OR
-        (NOT TRILINOS_USE_MPI AND DEAL_II_COMPILER_SUPPORTS_MPI))
+    # Epetra installs Epetra_MpiComm.h if configured trilinos was
+    # configured with mpi. We use this as a check for the mpi configuration
+    # of Epetra.
+    #
+    LIST(APPEND CMAKE_REQUIRED_INCLUDES ${TRILINOS_INCLUDE_DIR})
+    CHECK_INCLUDE_FILE_CXX("Epetra_MpiComm.h" TRILINOS_HAVE_EPETRA_MPICOMM_H)
+    LIST(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES ${TRILINOS_INCLUDE_DIR})
+
+    IF( (TRILINOS_HAVE_EPETRA_MPICOMM_H AND NOT DEAL_II_COMPILER_SUPPORTS_MPI)
+         OR
+         (NOT TRILINOS_HAVE_EPETRA_MPICOMM_H AND DEAL_II_COMPILER_SUPPORTS_MPI))
       MESSAGE(WARNING "
 Trilinos has to be configured with the same MPI configuration as deal.II.
 
index 415c8489fe4512e69149c6d1b66fc6faf910d2ee..a5e11f4b32a057dce79e311e7f60399fe0544958 100644 (file)
@@ -6,4 +6,5 @@ INCLUDE(CheckCXXCompilerFlag)
 INCLUDE(CheckCXXSourceCompiles)
 INCLUDE(CheckCXXSourceRuns)
 INCLUDE(CheckFunctionExists)
-INCLUDE(CheckIncludeFiles)
+INCLUDE(CheckIncludeFile)
+INCLUDE(CheckIncludeFileCXX)

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.