Fix a bug where DEAL_II_TRILINOS_WITH_SACADO was set even if

DEAL_II_WITH_TRILINOS was not

diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake
index 4f1ecbea50b3dbe36bed66a64b802dd0bb5466fd..5cffa8b6ab8065cdced1139a45f37011347c3df2 100644 (file)
--- a/cmake/configure/configure_2_trilinos.cmake
+++ b/cmake/configure/configure_2_trilinos.cmake
@@ -66,19 +66,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
         )
     ENDIF()
 
-    IF (${var})
-      FOREACH(_optional_module ROL Sacado Zoltan)
-      ITEM_MATCHES(_module_found ${_optional_module} ${Trilinos_PACKAGE_LIST})
-      IF(_module_found)
-          MESSAGE(STATUS "Found ${_optional_module}")
-          STRING(TOUPPER "${_optional_module}" _optional_module_upper)
-          SET(DEAL_II_TRILINOS_WITH_${_optional_module_upper} ON)
-      ELSE()
-          MESSAGE(STATUS "Module ${_optional_module} not found!")
-      ENDIF()
-      ENDFOREACH()
-    ENDIF()
-
     #
     # We require at least Trilinos 12.4
     #
@@ -156,6 +143,21 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
       SET(${var} FALSE)
     ENDIF()
 
+    CHECK_MPI_INTERFACE(TRILINOS ${var})
+
+    IF (${var})
+      FOREACH(_optional_module ROL Sacado Zoltan)
+      ITEM_MATCHES(_module_found ${_optional_module} ${Trilinos_PACKAGE_LIST})
+      IF(_module_found)
+          MESSAGE(STATUS "Found ${_optional_module}")
+          STRING(TOUPPER "${_optional_module}" _optional_module_upper)
+          SET(DEAL_II_TRILINOS_WITH_${_optional_module_upper} ON)
+      ELSE()
+          MESSAGE(STATUS "Module ${_optional_module} not found!")
+      ENDIF()
+      ENDFOREACH()
+    ENDIF()
+
     IF(${DEAL_II_TRILINOS_WITH_SACADO})
       #
       # Look for Sacado_config.h - we'll query it to determine C++11 support:
@@ -211,8 +213,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
       ENDIF()
 
     ENDIF()
-
-    CHECK_MPI_INTERFACE(TRILINOS ${var})
   ENDIF()
 ENDMACRO()