Add requirement for EpetraExt when using Trilinos

diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake
index 5cffa8b6ab8065cdced1139a45f37011347c3df2..062c421ef4472f480de7d703e9591b37a309bcb4 100644 (file)
--- 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 a512a888e1bc4c725e45387273a0f95376c4c271..ffb3d51c78c799fcc1db35d87817f4a55ef13f72 100644 (file)
--- 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 c0666e98a1c1c2df67ab8b74ca16fce0ae5a9a66..af22c185636caac464ad6ab037317a3baf6c0c11 100644 (file)
--- 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