Fix dependencies.

diff --git a/examples/step-74/CMakeLists.txt b/examples/step-74/CMakeLists.txt
index 5e308b4c975accd3b7e0a5cf409bfbf300c2daa3..f55865387d41fa2bddc9bc787046dd0a6bb9f183 100644 (file)
--- a/examples/step-74/CMakeLists.txt
+++ b/examples/step-74/CMakeLists.txt
@@ -34,6 +34,19 @@ if(NOT ${deal.II_FOUND})
     )
 endif()
 
+#
+# Are all dependencies fulfilled?
+#
+if(NOT DEAL_II_WITH_UMFPACK) # keep in one line
+  message(FATAL_ERROR "
+Error! This tutorial requires a deal.II library that was configured with the following options:
+    DEAL_II_WITH_UMFPACK = ON
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options:
+    DEAL_II_WITH_UMFPACK = ${DEAL_II_WITH_UMFPACK}
+This conflicts with the requirements."
+    )
+endif()
+
 deal_ii_initialize_cached_variables()
 project(${TARGET})
 deal_ii_invoke_autopilot()

diff --git a/examples/step-79/CMakeLists.txt b/examples/step-79/CMakeLists.txt
index 719bce76982cdf95b4919b11f7c3463a9ef9bbf7..0edbc167eeef64c62911c977b98ecb74d439251d 100644 (file)
--- a/examples/step-79/CMakeLists.txt
+++ b/examples/step-79/CMakeLists.txt
@@ -34,6 +34,19 @@ if(NOT ${deal.II_FOUND})
     )
 endif()
 
+#
+# Are all dependencies fulfilled?
+#
+if(NOT DEAL_II_WITH_UMFPACK) # keep in one line
+  message(FATAL_ERROR "
+Error! This tutorial requires a deal.II library that was configured with the following options:
+    DEAL_II_WITH_UMFPACK = ON
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options:
+    DEAL_II_WITH_UMFPACK = ${DEAL_II_WITH_UMFPACK}
+This conflicts with the requirements."
+    )
+endif()
+
 deal_ii_initialize_cached_variables()
 project(${TARGET})
 deal_ii_invoke_autopilot()

diff --git a/tests/examples/step-29.output b/tests/examples/step-29.with_umfpack=true.output
similarity index 100%
rename from tests/examples/step-29.output
rename to tests/examples/step-29.with_umfpack=true.output

diff --git a/tests/examples/step-58.output b/tests/examples/step-58.with_umfpack=true.with_complex_values=true.output
similarity index 100%
rename from tests/examples/step-58.output
rename to tests/examples/step-58.with_umfpack=true.with_complex_values=true.output

diff --git a/tests/examples/step-74.output b/tests/examples/step-74.with_umfpack=true.output
similarity index 100%
rename from tests/examples/step-74.output
rename to tests/examples/step-74.with_umfpack=true.output

diff --git a/tests/examples/step-79.output b/tests/examples/step-79.with_umfpack=true.output
similarity index 100%
rename from tests/examples/step-79.output
rename to tests/examples/step-79.with_umfpack=true.output