[cig-commits] commit 2537 by heister to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 2537

improve error handling when deal.II has no trilinos or p4est

U   trunk/aspect/CMakeLists.txt


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=2537&peg=2537

Diff:
Modified: trunk/aspect/CMakeLists.txt
===================================================================
--- trunk/aspect/CMakeLists.txt	2014-04-15 11:58:42 UTC (rev 2536)
+++ trunk/aspect/CMakeLists.txt	2014-04-15 12:20:37 UTC (rev 2537)
@@ -42,21 +42,25 @@
     )
 ENDIF()
 
+MESSAGE(STATUS "found deal.II version ${DEAL_II_PACKAGE_VERSION} at '${deal.II_DIR}'")
+
 IF(NOT DEAL_II_WITH_TRILINOS OR NOT DEAL_II_WITH_P4EST)
-  MESSAGE(FATAL_ERROR
-    "
Aspect requires a deal.II installation built with support for Trilinos and p4est but one or both of these appears to be missing!
"
-    )
   IF(NOT DEAL_II_WITH_TRILINOS)
-    MESSAGE(FATAL_ERROR
+    MESSAGE(SEND_ERROR
       "
-- deal.II was built without support for Trilinos!
"
       )
   ENDIF()
 
   IF(NOT DEAL_II_WITH_P4EST)
-    MESSAGE(FATAL_ERROR
+    MESSAGE(SEND_ERROR
       "
-- deal.II was built without support for p4est!
"
       )
   ENDIF()
+
+  MESSAGE(FATAL_ERROR
+    "
Aspect requires a deal.II installation built with support for Trilinos and p4est but one or both of these appears to be missing!
"
+    )
+
 ENDIF()
 
 DEAL_II_INITIALIZE_CACHED_VARIABLES()