From af9ab46041c0f1b1e4deec7491e25a7cebaf874b Mon Sep 17 00:00:00 2001 From: Nivesh Dommaraju Date: Sun, 26 Nov 2017 11:45:11 -0600 Subject: [PATCH] CMake: Add check for Zoltan to trilinos configuration --- cmake/configure/configure_2_trilinos.cmake | 25 +++++++++++----------- include/deal.II/base/config.h.in | 1 + 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/cmake/configure/configure_2_trilinos.cmake b/cmake/configure/configure_2_trilinos.cmake index 428e40eb4c..fea1c9e495 100644 --- a/cmake/configure/configure_2_trilinos.cmake +++ b/cmake/configure/configure_2_trilinos.cmake @@ -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() diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index 72ad3e670e..95da58f00e 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -156,6 +156,7 @@ /* 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 -- 2.39.5