From: Bruno Turcksin <bruno.turcksin@gmail.com>
Date: Wed, 22 Aug 2018 20:46:08 +0000 (+0000)
Subject: Add requirement for EpetraExt when using Trilinos
X-Git-Tag: v9.1.0-rc1~770^2~3
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37a3298c7f58410602bca6d0fc5a0d197c176efe;p=dealii.git

Add requirement for EpetraExt when using Trilinos
---

diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake
index 5cffa8b6ab..062c421ef4 100644
--- a/cmake/configure/configure_2_trilinos.cmake
+++ b/cmake/configure/configure_2_trilinos.cmake
@@ -42,7 +42,7 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
       )
 
     FOREACH(_module
-      Amesos Epetra Ifpack AztecOO Teuchos ML MueLu
+        Amesos Epetra Ifpack AztecOO Teuchos ML MueLu
       )
       ITEM_MATCHES(_module_found ${_module} ${Trilinos_PACKAGE_LIST})
       IF(_module_found)
@@ -146,7 +146,7 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
     CHECK_MPI_INTERFACE(TRILINOS ${var})
 
     IF (${var})
-      FOREACH(_optional_module ROL Sacado Zoltan)
+      FOREACH(_optional_module EpetraExt ROL Sacado Zoltan)
       ITEM_MATCHES(_module_found ${_optional_module} ${Trilinos_PACKAGE_LIST})
       IF(_module_found)
           MESSAGE(STATUS "Found ${_optional_module}")
diff --git a/doc/external-libs/trilinos.html b/doc/external-libs/trilinos.html
index a512a888e1..ffb3d51c78 100644
--- a/doc/external-libs/trilinos.html
+++ b/doc/external-libs/trilinos.html
@@ -60,6 +60,7 @@
         <li> Amesos,
         <li> AztecOO,
         <li> Epetra,
+        <li> EpetraExt,
         <li> Ifpack,
         <li> ML,
         <li> MueLu,
@@ -83,6 +84,7 @@
     cmake                                            \
     -DTrilinos_ENABLE_Amesos=ON                      \
     -DTrilinos_ENABLE_Epetra=ON                      \
+    -DTrilinos_ENABLE_EpetraExt=ON                   \
     -DTrilinos_ENABLE_Ifpack=ON                      \
     -DTrilinos_ENABLE_AztecOO=ON                     \
     -DTrilinos_ENABLE_Sacado=ON                      \
diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index c0666e98a1..af22c18563 100644
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -171,6 +171,7 @@
 
 /* cmake/configure/configure_2_trilinos.cmake */
 #cmakedefine DEAL_II_TRILINOS_CXX_SUPPORTS_SACADO_COMPLEX_RAD
+#cmakedefine DEAL_II_TRILINOS_WITH_EPETRAEXT
 #cmakedefine DEAL_II_TRILINOS_WITH_ROL
 #cmakedefine DEAL_II_TRILINOS_WITH_SACADO
 #cmakedefine DEAL_II_TRILINOS_WITH_ZOLTAN