Fix even more dependencies.

diff --git a/examples/step-47/CMakeLists.txt b/examples/step-47/CMakeLists.txt
index 1f1baefe2667c23a16b56bcdf8533e2a7dadc14a..6ed7fe381c7e4088878612a3ecc9663c2c313c25 100644 (file)
--- a/examples/step-47/CMakeLists.txt
+++ b/examples/step-47/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-82/CMakeLists.txt b/examples/step-82/CMakeLists.txt
index b22074ed69421d989b63016deb911be06d77c653..44386a0fdff11965b4c37e64f8a10b5fae9fcc85 100644 (file)
--- a/examples/step-82/CMakeLists.txt
+++ b/examples/step-82/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-85/CMakeLists.txt b/examples/step-85/CMakeLists.txt
index 8a5fbea5b3d3e3e72043b7b2000bbeb1c916a902..c55c7cabe504c966652531e038e278e562113ae9 100644 (file)
--- a/examples/step-85/CMakeLists.txt
+++ b/examples/step-85/CMakeLists.txt
@@ -34,6 +34,19 @@ if(NOT ${deal.II_FOUND})
     )
 endif()
 
+#
+# Are all dependencies fulfilled?
+#
+if(NOT DEAL_II_WITH_LAPACK) # 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_LAPACK = ON
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options:
+    DEAL_II_WITH_LAPACK = ${DEAL_II_WITH_LAPACK}
+This conflicts with the requirements."
+    )
+endif()
+
 deal_ii_initialize_cached_variables()
 project(${TARGET})
 deal_ii_invoke_autopilot()

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

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

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