From: Matthias Maier Date: Thu, 20 Sep 2012 09:05:52 +0000 (+0000) Subject: Change variable name X-Git-Tag: v8.0.0~1079^2~766 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfde761b1136ab72102866379aae4ea46e4236fd;p=dealii.git Change variable name git-svn-id: https://svn.dealii.org/branches/branch_cmake@26548 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/contrib/cmake/configure/configure_trilinos.cmake b/deal.II/contrib/cmake/configure/configure_trilinos.cmake index 7798de1974..af8e8c6542 100644 --- a/deal.II/contrib/cmake/configure/configure_trilinos.cmake +++ b/deal.II/contrib/cmake/configure/configure_trilinos.cmake @@ -84,12 +84,12 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) # of Epetra. # IF(EXISTS "${TRILINOS_INCLUDE_DIR}/Epetra_MpiComm.h") - SET(TRILINOS_HAVE_EPETRA_MPICOMM_H TRUE) + SET(TRILINOS_WITH_MPICOMM TRUE) ENDIF() - IF( (TRILINOS_HAVE_EPETRA_MPICOMM_H AND NOT DEAL_II_COMPILER_SUPPORTS_MPI) + IF( (TRILINOS_WITH_MPI AND NOT DEAL_II_COMPILER_SUPPORTS_MPI) OR - (NOT TRILINOS_HAVE_EPETRA_MPICOMM_H AND DEAL_II_COMPILER_SUPPORTS_MPI)) + (NOT TRILINOS_WITH_MPI AND DEAL_II_COMPILER_SUPPORTS_MPI)) MESSAGE(WARNING "\n" "Trilinos has to be configured with the same MPI configuration as deal.II.\n\n" )