]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Promote every SEND_ERROR message to FATAL_ERROR to produce more prominent error messages.
authormaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Oct 2012 21:09:52 +0000 (21:09 +0000)
committermaier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 4 Oct 2012 21:09:52 +0000 (21:09 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_cmake@26958 0785d39b-7218-0410-832d-ea1e28bc413d

12 files changed:
deal.II/cmake/configure/configure_1_mpi.cmake
deal.II/cmake/configure/configure_boost.cmake
deal.II/cmake/configure/configure_doxygen.cmake
deal.II/cmake/configure/configure_functionparser.cmake
deal.II/cmake/configure/configure_metis.cmake
deal.II/cmake/configure/configure_mumps.cmake
deal.II/cmake/configure/configure_p4est.cmake
deal.II/cmake/configure/configure_petsc.cmake
deal.II/cmake/configure/configure_trilinos.cmake
deal.II/cmake/configure/configure_umfpack.cmake
deal.II/cmake/macros/macro_configure_feature.cmake
deal.II/cmake/setup_compiler_flags.cmake

index adf42edd9e3b8829967a2b522e25669181098dfa..e8bf9ad62f16890f45fbb5a051b81e5eee6239ec 100644 (file)
@@ -63,7 +63,7 @@ SET(FEATURE_MPI_CUSTOM_ERROR_MESSAGE TRUE)
 
 
 MACRO(FEATURE_MPI_ERROR_MESSAGE)
-  MESSAGE(SEND_ERROR "\n"
+  MESSAGE(FATAL_ERROR "\n"
     "Could not find any suitable mpi library!\n\n"
     "Please ensure that an mpi library is installed on your computer.\n"
     "If the library is not at a default location, either provide some hints\n"
index 181ca57c45cbc5b46abb856710047d871e7e5cd7..327aca8465638cc23198ffbeefcdc224cc537951 100644 (file)
@@ -96,7 +96,7 @@ IF(NOT DEAL_II_WITH_BOOST)
   IF(DEAL_II_FEATURE_AUTODETECTION)
     FEATURE_ERROR_MESSAGE("BOOST")
   ELSE()
-    MESSAGE(SEND_ERROR "\n"
+    MESSAGE(FATAL_ERROR "\n"
       "Unmet configuration requirements: "
       "DEAL_II_WITH_BOOST required, but set to OFF!.\n\n"
       )
index b8e58e2d4d5e5ac87a2fd04d3cbf6ac7db9dfbf5..8c5c9875680a48bb2810ac5d80d98c7648538495 100644 (file)
@@ -49,7 +49,7 @@ SET(FEATURE_DOXYGEN_CUSTOM_ERROR_MESSAGE TRUE)
 
 
 MACRO(FEATURE_DOXYGEN_ERROR_MESSAGE)
-  MESSAGE(SEND_ERROR "\n"
+  MESSAGE(FATAL_ERROR "\n"
     "Could not find the doxygen package!\n\n"
     "Please ensure that doxygen and dot are installed on your computer.\n"
     "If the packages are not at a default location, either provide some hints\n"
@@ -68,7 +68,7 @@ IF(DEAL_II_COMPONENT_DOCUMENTATION AND NOT DEAL_II_WITH_DOXYGEN)
   IF(DEAL_II_FEATURE_AUTODETECTION)
     FEATURE_DOXYGEN_ERROR_MESSAGE()
   ELSE()
-    MESSAGE(SEND_ERROR "\n"
+    MESSAGE(FATAL_ERROR "\n"
       "DEAL_II_COMPONENT_DOCUMENTATION has unmet configuration requirements: "
       "DEAL_II_WITH_DOXYGEN required, but set to OFF!\n\n"
       )
index e4d7f9726bbf1bbf8d34b3be31d36ddc233a0c6e..f6ef8b33c8df64e3f5e115fa4fc5cfb0034bf037 100644 (file)
@@ -43,7 +43,7 @@ SET(FEATURE_FUNCTIONPARSER_CUSTOM_ERROR_MESSAGE TRUE)
 
 
 MACRO(FEATURE_FUNCTIONPARSER_ERROR_MESSAGE)
-  MESSAGE(SEND_ERROR "\n"
+  MESSAGE(FATAL_ERROR "\n"
     "No module available for finding functionparser externally.\n"
     "Disable DEAL_II_WITH_FUNCTIONPARSER, or enable DEAL_II_ALLOW_BUNDLED.\n\n"
     )
index ddf4b8e34b5c8caf57c4ba14fbae00dcd33696d9..dba4ba4f5a7b59f87bc5853b11e63ff246dcaab7 100644 (file)
@@ -45,7 +45,7 @@ SET(FEATURE_METIS_CUSTOM_ERROR_MESSAGE TRUE)
 
 
 MACRO(FEATURE_METIS_ERROR_MESSAGE)
-  MESSAGE(SEND_ERROR "\n"
+  MESSAGE(FATAL_ERROR "\n"
     "Could not find the metis library!\n\n"
     "Please ensure that the metis library version 5.0 or newer is installed on your computer.\n"
     "If the library is not at a default location, either provide some hints\n"
index 2942b9a8405f83f9c18880be4fbf66a8bc555422..d704eab5da7abf2737fd44ffbdea0b8fd971c581 100644 (file)
@@ -48,7 +48,7 @@ SET(FEATURE_MUMPS_CUSTOM_ERROR_MESSAGE TRUE)
 
 
 MACRO(FEATURE_MUMPS_ERROR_MESSAGE)
-  MESSAGE(SEND_ERROR "\n"
+  MESSAGE(FATAL_ERROR "\n"
     "Could not find the mumps library!\n"
     "Please ensure that the library is installed on your computer.\n"
     "If the libraries is not at a default location, either provide some hints\n"
index 0c8c03fedcf8cd68425cd40d113c25a94f43c28d..6846194aa4438d609c906c8a38f6171cdc65b206 100644 (file)
@@ -60,7 +60,7 @@ SET(FEATURE_P4EST_CUSTOM_ERROR_MESSAGE TRUE)
 
 
 MACRO(FEATURE_P4EST_ERROR_MESSAGE)
-  MESSAGE(SEND_ERROR "\n"
+  MESSAGE(FATAL_ERROR "\n"
     "Could not find the p4est and sc libraries!\n\n"
     "Please ensure that the libraries are installed on your computer.\n"
     "If the libraries are not at a default location, either provide some hints\n"
index 6247da4c62a8e1c4aad2c23a5e95d04e65cb433d..d205b41fef8376918b39ad435b0b836a7ab46644 100644 (file)
@@ -96,7 +96,7 @@ SET(FEATURE_PETSC_CUSTOM_ERROR_MESSAGE TRUE)
 
 
 MACRO(FEATURE_PETSC_ERROR_MESSAGE)
-  MESSAGE(SEND_ERROR "\n"
+  MESSAGE(FATAL_ERROR "\n"
     "Could not find the petsc library!\n\n"
     "Please ensure that the petsc library version 3.0.0 or newer is installed on your computer.\n"
     "If the library is not at a default location, either provide some hints\n"
index f1eb7ad95f2ea01f7517319c7ded26e0780d41c0..4d220425dec6ec597174edabbcaca4e9ddf80c12 100644 (file)
@@ -205,7 +205,7 @@ SET(FEATURE_TRILINOS_CUSTOM_ERROR_MESSAGE TRUE)
 
 
 MACRO(FEATURE_TRILINOS_ERROR_MESSAGE)
-  MESSAGE(SEND_ERROR "\n"
+  MESSAGE(FATAL_ERROR "\n"
     "Could not find a suitable set of trilinos libraries!\n"
     "Please ensure that all necessary libraries are installed on your computer.\n"
     "If the libraries are not at a default location, either provide some hints\n"
index 9c926a48c92fa2af05eeaab48bd9fc7a9300e93f..9ea8c231bc70fc1ca2d22624f8db243c9038c3dd 100644 (file)
@@ -58,7 +58,7 @@ SET(FEATURE_UMFPACK_CUSTOM_ERROR_MESSAGE TRUE)
 
 
 MACRO(FEATURE_UMFPACK_ERROR_MESSAGE)
-  MESSAGE(SEND_ERROR "\n"
+  MESSAGE(FATAL_ERROR "\n"
     "Could not find the umfpack and amd libraries!\n"
     "Please ensure that the libraries are installed on your computer.\n"
     "If the libraries are not at a default location, either provide some hints\n"
index a497af88a3c6e0d6b08ea4a918f8faeb31273530..bc4ae86f19712b4704e056ebbfe43cd8043cb627 100644 (file)
@@ -49,7 +49,7 @@
 #    fullfilled. In this case all necessary variables for
 #    FEATURE_${feature}_CONFIGURE_EXTERNAL must be set. Otherwise
 #    var should remain unset.
-#    This macro should give an error (SEND_ERROR or FATAL_ERROR).
+#    This macro should give an error (FATAL_ERROR or FATAL_ERROR).
 #
 # FEATURE_${feature}_CONFIGURE_EXTERNAL(var)  (macro, mandatory)
 #    which should setup all necessary configuration for the feature with
@@ -61,7 +61,7 @@
 #    is set up, or be undefined.
 #
 # FEATURE_${feature}_ERROR_MESSAGE()  (macro, optional)
-#    which should print a meaningfull error message (with SEND_ERROR) for
+#    which should print a meaningfull error message (with FATAL_ERROR) for
 #    the case that no external library was found (and bundled is not
 #    allowed to be used.) If not defined, a suitable default error message
 #    will be printed.
@@ -102,7 +102,7 @@ ENDMACRO()
 MACRO(FEATURE_ERROR_MESSAGE feature)
   STRING(TOLOWER ${feature} feature_lowercase)
   IF(FEATURE_${feature}_HAVE_BUNDLED)
-    MESSAGE(SEND_ERROR "\n"
+    MESSAGE(FATAL_ERROR "\n"
       "Could not find the ${feature_lowercase} library!\n\n"
       "Please ensure that the ${feature_lowercase} library is installed on your computer.\n"
       "If the library is not at a default location, either provide some hints\n"
@@ -112,7 +112,7 @@ MACRO(FEATURE_ERROR_MESSAGE feature)
       "DEAL_II_FORCE_BUNDLED_${feature}=on.\n\n"
       )
  ELSE()
-    MESSAGE(SEND_ERROR "\n"
+    MESSAGE(FATAL_ERROR "\n"
       "Could not find the ${feature_lowercase} library!\n\n"
       "Please ensure that the ${feature_lowercase} library is installed on your computer.\n"
       "If the library is not at a default location, either provide some hints\n"
@@ -173,7 +173,7 @@ MACRO(CONFIGURE_FEATURE feature)
     FOREACH(macro_dependency ${FEATURE_${feature}_DEPENDS})
       IF(NOT ${macro_dependency})
         IF(DEAL_II_WITH_${feature})
-          MESSAGE(SEND_ERROR "\n"
+          MESSAGE(FATAL_ERROR "\n"
             "DEAL_II_WITH_${feature} has unmet configuration requirements: "
             "${macro_dependency} has to be set to \"ON\".\n\n"
             )
@@ -205,14 +205,15 @@ MACRO(CONFIGURE_FEATURE feature)
             SET_CACHED_OPTION(${feature} ON)
           ELSE()
             # This should not happen. So give an error
-            MESSAGE(SEND_ERROR
-              "Failed to set up DEAL_II_WITH_${feature} with bundled packages."
+            MESSAGE(FATAL_ERROR
+              "\nInternal build system error: Failed to set up "
+              "DEAL_II_WITH_${feature} with bundled packages.\n\n"
               )
           ENDIF()
         ELSE()
-          MESSAGE(FATAL_ERROR
+          MESSAGE(FATAL_ERROR "\n"
             "Internal build system error: DEAL_II_FORCE_BUNDLED_${feature} "
-            "defined, but FEATURE_${feature}_HAVE_BUNDLED not present."
+            "defined, but FEATURE_${feature}_HAVE_BUNDLED not present.\n"
             )
         ENDIF()
 
@@ -240,8 +241,9 @@ MACRO(CONFIGURE_FEATURE feature)
             SET_CACHED_OPTION(${feature} ON)
           ELSE()
             # This should not happen. So give an error
-            MESSAGE(SEND_ERROR
-              "Failed to set up DEAL_II_WITH_${feature} with external dependencies."
+            MESSAGE(FATAL_ERROR
+              "\nInternal build system error: Failed to set up "
+              "DEAL_II_WITH_${feature} with external dependencies.\n\n"
               )
           ENDIF()
 
@@ -264,8 +266,9 @@ MACRO(CONFIGURE_FEATURE feature)
               ENDIF()
             ELSE()
               # This should not happen. So give an error
-              MESSAGE(SEND_ERROR
-                "Failed to set up DEAL_II_WITH_${feature} with bundled packages."
+              MESSAGE(FATAL_ERROR
+                "\nInternal build system error: Failed to set up "
+                "DEAL_II_WITH_${feature} with bundled packages.\n\n"
                 )
             ENDIF()
           ELSE()
index d009c30554b821b8ca82546a37a3bb93cbc11473..a92de7262b61b80d70e1088e244d6b31dfb58101 100644 (file)
@@ -58,7 +58,7 @@
 #
 IF(NOT ( "${CMAKE_C_COMPILER_ID}" STREQUAL "${CMAKE_CXX_COMPILER_ID}" AND
          "${CMAKE_C_COMPILER_VERSION}" STREQUAL "${CMAKE_CXX_COMPILER_VERSION}" ) )
-    MESSAGE(SEND_ERROR "\n"
+    MESSAGE(FATAL_ERROR "\n"
       "Configuration error: The specified C and CXX compiler have to be the "
       "same, but found:\n"
       "CMAKE_C_COMPILER: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}\n"

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.