From: maier Date: Wed, 19 Sep 2012 21:28:51 +0000 (+0000) Subject: Fix the mpi-Support check for trilinos X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=239a9c07d0fe14b7b7bce54bcc91a744218f0033;p=dealii-svn.git Fix the mpi-Support check for trilinos git-svn-id: https://svn.dealii.org/branches/branch_cmake@26524 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt index 9a95e2b667..65f15308a9 100644 --- a/deal.II/CMakeLists.txt +++ b/deal.II/CMakeLists.txt @@ -132,7 +132,7 @@ OPTION(DEAL_II_ALLOW_CONTRIB packages, so to ensure that only external libraries are used DEAL_II_ALLOW_CONTRIB as well as all DEAL_II_FORCE_CONTRIB_* have to be OFF" - ON) + OFF) OPTION(DEAL_II_WITH_ARPACK "Build deal.II with support for ARPACK." @@ -145,7 +145,7 @@ OPTION(DEAL_II_WITH_BLAS OPTION(DEAL_II_WITH_DOXYGEN "Enable the generation and installation of the documentation via doxygen. This feature adds a COMPONENT \"documentation\" to the build system." - ON) + OFF) OPTION(DEAL_II_WITH_FUNCTIONPARSER "Build deal.II with support for functionparser." @@ -179,7 +179,7 @@ OPTION(DEAL_II_WITH_TBB OFF) OPTION(DEAL_II_FORCE_CONTRIB_TBB "Always use the bundled tbb library instead of an external one." - ON) + OFF) OPTION(DEAL_II_WITH_TRILINOS "Build deal.II with support for trilinos." @@ -190,7 +190,7 @@ OPTION(DEAL_II_WITH_UMFPACK OFF) OPTION(DEAL_II_FORCE_CONTRIB_UMFPACK "Always use the bundled umfpack library instead of an external one." - ON) + OFF) OPTION(DEAL_II_WITH_ZLIB "Build deal.II with support for zlib." @@ -198,7 +198,7 @@ OPTION(DEAL_II_WITH_ZLIB OPTION(DEAL_II_FORCE_CONTRIB_BOOST "Always use the bundled boost library instead of an external one." - ON) + OFF) # # Build configuration: configuration options regarding compilation and diff --git a/deal.II/contrib/cmake/configure/configure_trilinos.cmake b/deal.II/contrib/cmake/configure/configure_trilinos.cmake index e4679d3d2c..0208b8c234 100644 --- a/deal.II/contrib/cmake/configure/configure_trilinos.cmake +++ b/deal.II/contrib/cmake/configure/configure_trilinos.cmake @@ -36,7 +36,7 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) IF(NOT ${var}) MESSAGE(WARNING "\n" - "The Trilinos installation is missing one or more modules necessary for\n" + "The Trilinos installation is missing one or more modules necessary for\n" "the deal.II Trilinos interfaces:\n" "${macro_modules_missing}\n\n" "Please re-install Trilinos with the missing Trilinos subpackages enabled.\n\n" @@ -89,9 +89,9 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) # 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(EXISTS "${TRILINOS_INCLUDE_DIR}/Epetra_MpiComm.h") + SET(TRILINOS_HAVE_EPETRA_MPICOMM_H TRUE) + ENDIF() IF( (TRILINOS_HAVE_EPETRA_MPICOMM_H AND NOT DEAL_II_COMPILER_SUPPORTS_MPI) OR