From c0174dd22bd7fb3c6fdf1575bb00138d8fa6979b Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Wed, 27 Nov 2024 16:07:05 +0100 Subject: [PATCH] Require Trilinos 12.14.1 if configured with ROL. --- cmake/configure/configure_20_trilinos.cmake | 20 ++++++++++++++++++- .../incompatibilities/20241128Fehling1 | 4 ++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 doc/news/changes/incompatibilities/20241128Fehling1 diff --git a/cmake/configure/configure_20_trilinos.cmake b/cmake/configure/configure_20_trilinos.cmake index 068dd8c6ad..e5a45f964f 100644 --- a/cmake/configure/configure_20_trilinos.cmake +++ b/cmake/configure/configure_20_trilinos.cmake @@ -82,7 +82,6 @@ macro(feature_trilinos_find_external var) # We require at least Trilinos 12.4 # if(TRILINOS_VERSION VERSION_LESS 12.4) - message(STATUS "Could not find a sufficient Trilinos installation: " "deal.II requires at least version 12.4, but version ${TRILINOS_VERSION} was found." ) @@ -224,6 +223,25 @@ macro(feature_trilinos_find_external var) KOKKOS_CHECK(OPTIONS CUDA_LAMBDA) endif() + if(TRILINOS_WITH_ROL) + # + # We require at least Trilinos 12.14.1 + # + if(TRILINOS_VERSION VERSION_LESS 12.14.1) + message(STATUS "Could not find a sufficient Trilinos installation: " + "deal.II requires at least version 12.14.1 if the Trilinos installation includes ROL, " + "but version ${TRILINOS_VERSION} was found." + ) + set(TRILINOS_ADDITIONAL_ERROR_STRING + ${TRILINOS_ADDITIONAL_ERROR_STRING} + "The Trilinos installation (found at \"${TRILINOS_DIR}\")\n" + "with version ${TRILINOS_VERSION} is too old.\n" + "deal.II requires at least version 12.14.1 if the Trilinos installation includes ROL.\n\n" + ) + set(${var} FALSE) + endif() + endif() + if(TRILINOS_WITH_TPETRA) # # Check if Tpetra is usable in fact. diff --git a/doc/news/changes/incompatibilities/20241128Fehling1 b/doc/news/changes/incompatibilities/20241128Fehling1 new file mode 100644 index 0000000000..0780693ff8 --- /dev/null +++ b/doc/news/changes/incompatibilities/20241128Fehling1 @@ -0,0 +1,4 @@ +Changed: The minimum version for Trilinos has been bumped to 12.14.1 +if Trilinos bundles ROL. +
+(Marc Fehling, 2024/11/28) -- 2.39.5