Same for hdf5, metis, petsc and slepc

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28776 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/configure/configure_hdf5.cmake b/deal.II/cmake/configure/configure_hdf5.cmake
index 89e257fb20261301c5ad6784a33c3e7218c263a1..ecd91d0514f4e8b679c41ae8486bbbf0d2b56e3a 100644 (file)
--- a/deal.II/cmake/configure/configure_hdf5.cmake
+++ b/deal.II/cmake/configure/configure_hdf5.cmake
@@ -25,10 +25,13 @@ MACRO(FEATURE_HDF5_FIND_EXTERNAL var)
          (NOT HDF5_WITH_MPI AND NOT DEAL_II_WITH_MPI))
       SET(${var} TRUE)
     ELSE()
-      MESSAGE(WARNING "\n"
-        "Could not find a sufficient hdf5 installation: "
-        "hdf5 has to be configured with the same MPI configuration as deal.II.\n\n"
+      SET(HDF5_ADDITIONAL_WARNING_STRING
+        "Insufficient hdf5 installation found!\n"
+        "hdf5 has to be configured with the same MPI configuration as deal.II, but found:\n"
+        "  DEAL_II_WITH_MPI = ${DEAL_II_WITH_MPI}\n"
+        "  HDF5_WITH_MPI    = ${HDF5_WITH_MPI}\n"
         )
+      MESSAGE(WARNING "\n" ${HDF5_ADDITIONAL_WARNING_STRING} "\n")
     ENDIF()
   ENDIF()
 ENDMACRO()

diff --git a/deal.II/cmake/configure/configure_metis.cmake b/deal.II/cmake/configure/configure_metis.cmake
index 75df50a4a2695f52fdf37e907bc9e823c1bed5df..ceda27210a98bad6ddc41ef9fb3b87f88bea417b 100644 (file)
--- a/deal.II/cmake/configure/configure_metis.cmake
+++ b/deal.II/cmake/configure/configure_metis.cmake
@@ -24,9 +24,13 @@ MACRO(FEATURE_METIS_FIND_EXTERNAL var)
       SET(${var} TRUE)
     ELSE()
       MESSAGE(WARNING "\n"
+        )
+      SET(METIS_ADDITIONAL_WARNING_STRING
         "Could not find a sufficient modern metis installation: "
-        "Version 5.x required!\n\n"
+        "Version 5.x required!\n"
         )
+      MESSAGE(WARNING "\n" ${METIS_ADDITIONAL_WARNING_STRING} "\n")
+
       UNSET(METIS_LIBRARY CACHE)
       UNSET(METIS_INCLUDE_DIR CACHE)
       UNSET(METIS_DIR CACHE)

diff --git a/deal.II/cmake/configure/configure_p4est.cmake b/deal.II/cmake/configure/configure_p4est.cmake
index 1aa68c1cf7400196dd619b9e0e51f2273edb02f9..beb2740b0c6664a914d5fc086e1fcb7ee12a8dcc 100644 (file)
--- a/deal.II/cmake/configure/configure_p4est.cmake
+++ b/deal.II/cmake/configure/configure_p4est.cmake
@@ -26,10 +26,12 @@ MACRO(FEATURE_P4EST_FIND_EXTERNAL var)
     # Check whether p4est supports mpi:
     #
     IF(NOT P4EST_WITH_MPI)
-      MESSAGE(WARNING "\n"
-        "Could not find a sufficient p4est installation: "
-        "P4est has to be configured with MPI support enabled.\n\n"
+      SET(HDF5_ADDITIONAL_WARNING_STRING
+        "Insufficient p4est installation found!\n"
+        "p4est has to be configured with enabled MPI.\n"
         )
+      MESSAGE(WARNING "\n" ${P4EST_ADDITIONAL_WARNING_STRING} "\n")
+
       UNSET(P4EST_DIR CACHE)
       UNSET(P4EST_LIBRARY CACHE)
       UNSET(P4EST_INCLUDE_DIR CACHE)

diff --git a/deal.II/cmake/configure/configure_petsc.cmake b/deal.II/cmake/configure/configure_petsc.cmake
index 7d6244f5d8bbe5c62b27216355247bc4c08654e6..62e8a7660b7ff3c51a90a4fcb2eedbf24b7b032e 100644 (file)
--- a/deal.II/cmake/configure/configure_petsc.cmake
+++ b/deal.II/cmake/configure/configure_petsc.cmake
@@ -31,10 +31,11 @@ MACRO(FEATURE_PETSC_FIND_EXTERNAL var)
     # We support petsc from version 3.x.x onwards
     #
     IF(PETSC_VERSION_MAJOR LESS 3)
-      MESSAGE(WARNING "\n"
+      SET(PETSC_ADDITIONAL_WARNING_STRING
         "Could not find a sufficient modern petsc installation: "
-        "Version >=3.0.0 required!\n\n"
+        "Version >=3.0.0 required!\n"
         )
+      MESSAGE(WARNING "\n" ${PETSC_ADDITIONAL_WARNING_STRING} "\n")
       SET(${var} FALSE)
     ENDIF()
 
@@ -49,10 +50,14 @@ 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(WARNING "\n"
-        "Could not find a sufficient petsc installation: "
-        "Petsc has to be configured with the same MPI configuration as deal.II.\n\n"
+      SET(PETSC_ADDITIONAL_WARNING_STRING
+        ${PETSC_ADDITIONAL_WARNING_STRING}
+        "Could not find a sufficient PETSc installation:\n"
+        "PETSc has to be configured with the same MPI configuration as deal.II, but found:\n"
+        "  DEAL_II_WITH_MPI = ${DEAL_II_WITH_MPI}\n"
+        "  PETSC_WITH_MPI   = (NOT ${PETSC_WITH_MPIUNI})\n"
         )
+      MESSAGE(WARNING "\n" ${PETSC_ADDITIONAL_WARNING_STRING} "\n")
       SET(${var} FALSE)
     ENDIF()
 
@@ -97,7 +102,8 @@ ENDMACRO()
 MACRO(FEATURE_PETSC_ERROR_MESSAGE)
   MESSAGE(FATAL_ERROR "\n"
     "Could not find the petsc library!\n"
-    "Please ensure that the petsc library version 3.0.0 or newer is installed on your computer.\n"
+    ${PETSC_ADDITIONAL_WARNING_STRING}
+    "\nPlease ensure that the petsc library version 3.0.0 or newer is installed on your computer.\n"
     "Furthermore PETSc has to be configured with the same mpi options as deal.II.\n"
     "If the library is not at a default location, either provide some hints\n"
     "for the autodetection:\n"

diff --git a/deal.II/cmake/configure/configure_slepc.cmake b/deal.II/cmake/configure/configure_slepc.cmake
index 40ae1b897a3cd951b50179b8b3f4205592f78847..e7b5f60adbc43e95e68f0774806a3f68a5950322 100644 (file)
--- a/deal.II/cmake/configure/configure_slepc.cmake
+++ b/deal.II/cmake/configure/configure_slepc.cmake
@@ -29,10 +29,12 @@ MACRO(FEATURE_SLEPC_FIND_EXTERNAL var)
       SET(${var} TRUE)
     ELSE()
 
-      MESSAGE(WARNING "\n"
+      SET(SLEPC_ADDITIONAL_WARNING_STRING
         "Could not find a sufficient SLEPc installation: "
-        "The SLEPc library must have the same version as the PETSc library.\n\n"
+        "The SLEPc library must have the same version as the PETSc library.\n"
         )
+      MESSAGE(WARNING "\n" ${SLEPC_ADDITIONAL_WARNING_STRING} "\n")
+
       UNSET(SLEPC_INCLUDE_DIR_ARCH CACHE)
       UNSET(SLEPC_INCLUDE_DIR_COMMON CACHE)
       UNSET(SLEPC_LIBRARY CACHE)
@@ -61,6 +63,7 @@ ENDMACRO()
 MACRO(FEATURE_SLEPC_ERROR_MESSAGE)
   MESSAGE(FATAL_ERROR "\n"
     "Could not find the SLEPc library!\n"
+    ${SLEPC_ADDITIONAL_WARNING_STRING}
     "Please ensure that the SLEPc library version 3.0.0 or newer is installed on your computer\n"
     "and the version is the same as the one of the installed PETSc library.\n"
     "If the library is not at a default location, either provide some hints\n"

diff --git a/deal.II/cmake/configure/configure_trilinos.cmake b/deal.II/cmake/configure/configure_trilinos.cmake
index 4d6495600671ffaa7518693389e960729f74e210..b1a93e5ea7b15b2f3b166d58a3f97b68857ef347 100644 (file)
--- a/deal.II/cmake/configure/configure_trilinos.cmake
+++ b/deal.II/cmake/configure/configure_trilinos.cmake
@@ -48,7 +48,7 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
     ENDFOREACH()
 
     IF(NOT ${var})
-      SET(TRILINOS_ADDITIONAL_INFORMATION
+      SET(TRILINOS_ADDITIONAL_WARNING_STRING
         "The Trilinos installation found at\n"
         "  ${TRILINOS_DIR}\n"
         "is missing one or more modules necessary for the deal.II Trilinos interfaces:\n"
@@ -56,7 +56,7 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
         "Please re-install Trilinos with the missing Trilinos subpackages
         enabled.\n\n"
         )
-      MESSAGE(WARNING "\n" ${TRILINOS_ADDITIONAL_INFORMATION} "\n")
+      MESSAGE(WARNING "\n" ${TRILINOS_ADDITIONAL_WARNING_STRING} "\n")
     ENDIF()
 
     #
@@ -75,15 +75,15 @@ MACRO(FEATURE_TRILINOS_FIND_EXTERNAL var)
         TRILINOS_VERSION_MINOR EQUAL 8 AND
         TRILINOS_VERSION_SUBMINOR LESS 2))
 
-      SET(TRILINOS_ADDITIONAL_INFORMATION
-        ${TRILINOS_ADDITIONAL_INFORMATION}
+      SET(TRILINOS_ADDITIONAL_WARNING_STRING
+        ${TRILINOS_ADDITIONAL_WARNING_STRING}
         "The Trilinos installation found at\n"
         "  ${TRILINOS_DIR}\n"
         "with version ${TRILINOS_VERSION_MAJOR}.${TRILINOS_VERSION_MINOR}.${TRILINOS_VERSION_SUBMINOR} has bugs that make\n"
         "it incompatible with deal.II. Please use versions before 10.6 or after\n"
         "10.8.1.\n\n"
         )
-      MESSAGE(WARNING "\n" ${TRILINOS_ADDITIONAL_INFORMATION} "\n")
+      MESSAGE(WARNING "\n" ${TRILINOS_ADDITIONAL_WARNING_STRING} "\n")
       SET(${var} FALSE)
     ENDIF()
 
@@ -94,15 +94,15 @@ 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))
-      SET(TRILINOS_ADDITIONAL_INFORMATION
-        ${TRILINOS_ADDITIONAL_INFORMATION}
+      SET(TRILINOS_ADDITIONAL_WARNING_STRING
+        ${TRILINOS_ADDITIONAL_WARNING_STRING}
         "The Trilinos installation found at\n"
         "  ${TRILINOS_DIR}\n"
         "has to be configured with the same MPI configuration as deal.II, but found:\n"
         "  DEAL_II_WITH_MPI = ${DEAL_II_WITH_MPI}\n"
         "  TRILINOS_WITH_MPI = ${TRILINOS_WITH_MPI}\n"
         )
-      MESSAGE(WARNING "\n" ${TRILINOS_ADDITIONAL_INFORMATION} "\n")
+      MESSAGE(WARNING "\n" ${TRILINOS_ADDITIONAL_WARNING_STRING} "\n")
       SET(${var} FALSE)
     ENDIF()
 
@@ -138,14 +138,14 @@ 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()
-        SET(TRILINOS_ADDITIONAL_INFORMATION
-          ${TRILINOS_ADDITIONAL_INFORMATION}
+        SET(TRILINOS_ADDITIONAL_WARNING_STRING
+          ${TRILINOS_ADDITIONAL_WARNING_STRING}
           "The Trilinos installation found at\n"
           "  ${TRILINOS_DIR}\n"
           "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_INFORMATION} "\n")
+        MESSAGE(WARNING "\n" ${TRILINOS_ADDITIONAL_WARNING_STRING} "\n")
         SET(${var} FALSE)
       ENDIF()
     ENDIF()
@@ -203,7 +203,7 @@ ENDMACRO()
 MACRO(FEATURE_TRILINOS_ERROR_MESSAGE)
   MESSAGE(FATAL_ERROR "\n"
     "Could not find a suitable set of trilinos libraries!\n"
-    ${TRILINOS_ADDITIONAL_INFORMATION}
+    ${TRILINOS_ADDITIONAL_WARNING_STRING}
     "Please ensure that a suitable set of trilinos libraries are installed on your computer.\n"
     "If the libraries are not at a default location, either provide some hints\n"
     "for the autodetection:\n"

diff --git a/deal.II/cmake/macros/macro_configure_feature.cmake b/deal.II/cmake/macros/macro_configure_feature.cmake
index 239ebb8a51fcac760bcd645e9a36227640cc29da..5b6a606013050b9530081d69a080eca50f381efb 100644 (file)
--- a/deal.II/cmake/macros/macro_configure_feature.cmake
+++ b/deal.II/cmake/macros/macro_configure_feature.cmake
@@ -113,7 +113,8 @@ ${_feature_lowercase} by setting DEAL_II_ALLOW_BUNDLED=on or\nDEAL_II_FORCE_BUND
 
   MESSAGE(FATAL_ERROR "\n"
     "Could not find the ${_feature_lowercase} library!\n"
-    "Please ensure that the ${_feature_lowercase} library is installed on your computer.\n"
+    ${${_feature}_ADDITIONAL_WARNING_STRING}
+    "Please ensure that a suitable ${_feature_lowercase} library is installed on your computer.\n"
     "If the library is not at a default location, either provide some hints\n"
     "for autodetection,${_hint_snippet}${_bundled_snippet}"
     )