From d7b14ac3b1de63df31872c8825b049c6d462afd9 Mon Sep 17 00:00:00 2001 From: Marc Fehling Date: Wed, 24 Jul 2024 13:29:45 +0200 Subject: [PATCH] Fix even more dependencies. --- examples/step-47/CMakeLists.txt | 13 +++++++++++++ examples/step-82/CMakeLists.txt | 13 +++++++++++++ examples/step-85/CMakeLists.txt | 13 +++++++++++++ ...p-47.output => step-47.with_umfpack=true.output} | 0 ...p-82.output => step-82.with_umfpack=true.output} | 0 ...ep-85.output => step-85.with_lapack=true.output} | 0 6 files changed, 39 insertions(+) rename tests/examples/{step-47.output => step-47.with_umfpack=true.output} (100%) rename tests/examples/{step-82.output => step-82.with_umfpack=true.output} (100%) rename tests/examples/{step-85.output => step-85.with_lapack=true.output} (100%) diff --git a/examples/step-47/CMakeLists.txt b/examples/step-47/CMakeLists.txt index 1f1baefe26..6ed7fe381c 100644 --- 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 b22074ed69..44386a0fdf 100644 --- 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 8a5fbea5b3..c55c7cabe5 100644 --- 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 -- 2.39.5