]> https://gitweb.dealii.org/ - dealii.git/commitdiff
CMake: Add check for Zoltan to trilinos configuration
authorNivesh Dommaraju <nidhinivesh.d@gmail.com>
Sun, 26 Nov 2017 17:45:11 +0000 (11:45 -0600)
committerMatthias Maier <tamiko@43-1.org>
Sun, 26 Nov 2017 17:45:46 +0000 (11:45 -0600)
cmake/configure/configure_2_trilinos.cmake
include/deal.II/base/config.h.in

index 428e40eb4c29e8bafbc49e8ad7655e17b40c8f62..fea1c9e495e554d8b266be82d3ca615853bb02aa 100644 (file)
@@ -54,18 +54,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
       ENDIF()
     ENDFOREACH()
 
-    FOREACH(_optional_module
-         ROL
-      )
-      ITEM_MATCHES(_module_found ${_optional_module} ${Trilinos_PACKAGE_LIST})
-      IF(_module_found)
-        MESSAGE(STATUS "Found ${_optional_module}")
-        SET(DEAL_II_TRILINOS_WITH_${_optional_module} ON)
-      ELSE()
-        MESSAGE(STATUS "Module ${_optional_module} not found!")
-      ENDIF()
-    ENDFOREACH()
-
     IF(NOT ${var})
       MESSAGE(STATUS "Could not find a sufficient Trilinos installation: "
         "Missing ${_modules_missing}"
@@ -181,6 +169,19 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
     ENDIF()
 
     CHECK_MPI_INTERFACE(TRILINOS ${var})
+
+    IF (${var})
+      FOREACH(_optional_module ROL 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()
   ENDIF()
 ENDMACRO()
 
index 72ad3e670e8f5e7110bc293228a6e4c7e804db6e..95da58f00e718b7e8e8da33ae16af82dd97975aa 100644 (file)
 /* cmake/configure/configure_2_trilinos.cmake */
 #cmakedefine DEAL_II_TRILINOS_CXX_SUPPORTS_SACADO_COMPLEX_RAD
 #cmakedefine DEAL_II_TRILINOS_WITH_ROL
+#cmakedefine DEAL_II_TRILINOS_WITH_ZOLTAN
 
 /*
  * Depending on the use of threads, we will have to make some variables

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.