From 9ae9c5c6ef22df7ad938f51720b564fbe7a335ac Mon Sep 17 00:00:00 2001 From: maier Date: Thu, 7 Mar 2013 22:39:20 +0000 Subject: [PATCH] CMake: Fix the status messages in configure_trilinos.cmake git-svn-id: https://svn.dealii.org/trunk@28804 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/cmake/configure/configure_petsc.cmake | 2 +- .../cmake/configure/configure_trilinos.cmake | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/deal.II/cmake/configure/configure_petsc.cmake b/deal.II/cmake/configure/configure_petsc.cmake index b3ae3c07c6..f0addefe65 100644 --- a/deal.II/cmake/configure/configure_petsc.cmake +++ b/deal.II/cmake/configure/configure_petsc.cmake @@ -52,7 +52,7 @@ MACRO(FEATURE_PETSC_FIND_EXTERNAL var) IF( (PETSC_WITH_MPIUNI AND DEAL_II_WITH_MPI) OR (NOT PETSC_WITH_MPIUNI AND NOT DEAL_II_WITH_MPI)) - MESSAGE(STATUS "Could not find a sufficient modern PETSc installation: " + MESSAGE(STATUS "Could not find a sufficient PETSc installation: " "PETSc has to be configured with the same MPI configuration as deal.II." ) SET(PETSC_ADDITIONAL_ERROR_STRING diff --git a/deal.II/cmake/configure/configure_trilinos.cmake b/deal.II/cmake/configure/configure_trilinos.cmake index 996beab5e4..870c8d88f7 100644 --- a/deal.II/cmake/configure/configure_trilinos.cmake +++ b/deal.II/cmake/configure/configure_trilinos.cmake @@ -33,7 +33,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) "Check whether the found trilinos package contains all required modules:" ) - FOREACH(_module amesos epetra ifpack aztecoo sacado teuchos ) @@ -48,6 +47,9 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) ENDFOREACH() IF(NOT ${var}) + MESSAGE(STATUS "Could not find a sufficient Trilinos installation: " + "Missing ${_modules_missing}" + ) SET(TRILINOS_ADDITIONAL_ERROR_STRING "The Trilinos installation found at\n" " ${TRILINOS_DIR}\n" @@ -56,7 +58,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) "Please re-install Trilinos with the missing Trilinos subpackages enabled.\n\n" ) - MESSAGE(WARNING "\n" ${TRILINOS_ADDITIONAL_ERROR_STRING} "\n") ENDIF() # @@ -75,6 +76,10 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) TRILINOS_VERSION_MINOR EQUAL 8 AND TRILINOS_VERSION_SUBMINOR LESS 2)) + MESSAGE(STATUS "Could not find a sufficient Trilinos installation: " + "Version ${TRILINOS_VERSION_MAJOR}.${TRILINOS_VERSION_MINOR}.${TRILINOS_VERSION_SUBMINOR} has bugs that make " + "it incompatible with deal.II. Please use versions before 10.6 or after 10.8.1" + ) SET(TRILINOS_ADDITIONAL_ERROR_STRING ${TRILINOS_ADDITIONAL_ERROR_STRING} "The Trilinos installation found at\n" @@ -83,7 +88,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) "it incompatible with deal.II. Please use versions before 10.6 or after\n" "10.8.1.\n\n" ) - MESSAGE(WARNING "\n" ${TRILINOS_ADDITIONAL_ERROR_STRING} "\n") SET(${var} FALSE) ENDIF() @@ -94,6 +98,9 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) IF( (TRILINOS_WITH_MPI AND NOT DEAL_II_WITH_MPI) OR (NOT TRILINOS_WITH_MPI AND DEAL_II_WITH_MPI)) + MESSAGE(STATUS "Could not find a sufficient Trilinos installation: " + "Trilinos has to be configured with the same MPI configuration as deal.II." + ) SET(TRILINOS_ADDITIONAL_ERROR_STRING ${TRILINOS_ADDITIONAL_ERROR_STRING} "The Trilinos installation found at\n" @@ -102,7 +109,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) " DEAL_II_WITH_MPI = ${DEAL_II_WITH_MPI}\n" " TRILINOS_WITH_MPI = ${TRILINOS_WITH_MPI}\n" ) - MESSAGE(WARNING "\n" ${TRILINOS_ADDITIONAL_ERROR_STRING} "\n") SET(${var} FALSE) ENDIF() @@ -138,6 +144,10 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) LIST(APPEND DEAL_II_DEFINITIONS "HAS_C99_TR1_CMATH") LIST(APPEND DEAL_II_USER_DEFINITIONS "HAS_C99_TR1_CMATH") ELSE() + MESSAGE(STATUS "Could not find a sufficient Trilinos installation: " + "The installation is not compatible with the C++ standard selected for " + "this compiler." + ) SET(TRILINOS_ADDITIONAL_ERROR_STRING ${TRILINOS_ADDITIONAL_ERROR_STRING} "The Trilinos installation found at\n" @@ -145,7 +155,6 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var) "is not compatible with the C++ standard selected for\n" "this compiler. See the deal.II FAQ page for a solution.\n\n" ) - MESSAGE(WARNING "\n" ${TRILINOS_ADDITIONAL_ERROR_STRING} "\n") SET(${var} FALSE) ENDIF() ENDIF() -- 2.39.5