From 272a465fd69fd872b1446b6baf3d2ac7c1fecfed Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Tue, 23 Jul 2024 13:30:11 +0200 Subject: [PATCH] Fix dependencies. --- examples/step-74/CMakeLists.txt | 13 +++++++++++++ examples/step-79/CMakeLists.txt | 13 +++++++++++++ ...p-29.output => step-29.with_umfpack=true.output} | 0 ...th_umfpack=true.with_complex_values=true.output} | 0 ...p-74.output => step-74.with_umfpack=true.output} | 0 ...p-79.output => step-79.with_umfpack=true.output} | 0 6 files changed, 26 insertions(+) rename tests/examples/{step-29.output => step-29.with_umfpack=true.output} (100%) rename tests/examples/{step-58.output => step-58.with_umfpack=true.with_complex_values=true.output} (100%) rename tests/examples/{step-74.output => step-74.with_umfpack=true.output} (100%) rename tests/examples/{step-79.output => step-79.with_umfpack=true.output} (100%) diff --git a/examples/step-74/CMakeLists.txt b/examples/step-74/CMakeLists.txt index 5e308b4c97..f55865387d 100644 --- 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 719bce7698..0edbc167ee 100644 --- 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 -- 2.39.5