Update CMake error message in tutorials.

This removes any ambiguity in the outputted message previously caused by
double negation.

Fixes #4600

diff --git a/examples/step-17/CMakeLists.txt b/examples/step-17/CMakeLists.txt
index a3450daf25532f260be325a7adf7030d81414d89..2fa04f67cc11c69714c6a2aee7e12b21f6262153 100644 (file)
--- a/examples/step-17/CMakeLists.txt
+++ b/examples/step-17/CMakeLists.txt
@@ -40,10 +40,10 @@ ENDIF ()
 #
 IF(NOT DEAL_II_WITH_PETSC OR DEAL_II_PETSC_WITH_COMPLEX) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_PETSC = ON
     DEAL_II_PETSC_WITH_COMPLEX = OFF
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-18/CMakeLists.txt b/examples/step-18/CMakeLists.txt
index 8413167a4d66150a3f196de5b1875320ed893539..7e8b7b442989c58b5a8c03e4a58afc2b86cd7f4a 100644 (file)
--- a/examples/step-18/CMakeLists.txt
+++ b/examples/step-18/CMakeLists.txt
@@ -40,11 +40,11 @@ ENDIF ()
 #
 IF(NOT DEAL_II_WITH_MPI OR NOT DEAL_II_WITH_PETSC OR DEAL_II_PETSC_WITH_COMPLEX) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_PETSC = ON
     DEAL_II_PETSC_WITH_COMPLEX = OFF
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-22/CMakeLists.txt b/examples/step-22/CMakeLists.txt
index 6a8e526fdf4b15e7dbb751c3f6a80697a99ae50c..4af31ea07ab223d2e00b59ba6f4f55d23bfd2e3b 100644 (file)
--- a/examples/step-22/CMakeLists.txt
+++ b/examples/step-22/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_UMFPACK) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_UMFPACK = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-29/CMakeLists.txt b/examples/step-29/CMakeLists.txt
index 493238c104a7dc978d501ffdb2fa0542371c072d..c31fb6ae9bd4c1c3b95dc6cf817780b1c8369cf1 100644 (file)
--- a/examples/step-29/CMakeLists.txt
+++ b/examples/step-29/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_UMFPACK) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_UMFPACK = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-31/CMakeLists.txt b/examples/step-31/CMakeLists.txt
index 6eda1768bb6940fd8a396d5ea54e2926a9ad8923..59b1e7ffbd230d7eed677ce759f5c3d9a24131f7 100644 (file)
--- a/examples/step-31/CMakeLists.txt
+++ b/examples/step-31/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_TRILINOS) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_TRILINOS = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-32/CMakeLists.txt b/examples/step-32/CMakeLists.txt
index c9edf9719367f189cca4a0e32e18e1dc6338b544..5263a44f6f1f5cd5533d6f68ba0a0491e7ff5288 100644 (file)
--- a/examples/step-32/CMakeLists.txt
+++ b/examples/step-32/CMakeLists.txt
@@ -42,11 +42,11 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_MPI OR NOT DEAL_II_WITH_P4EST OR NOT DEAL_II_WITH_TRILINOS) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_P4EST = ON
     DEAL_II_WITH_TRILINOS = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-33/CMakeLists.txt b/examples/step-33/CMakeLists.txt
index ddc51a657914ad12d4638fb3d1dd0f4d74735fb9..898ee500e02b3e78d80a8a6e966ea063f4948abe 100644 (file)
--- a/examples/step-33/CMakeLists.txt
+++ b/examples/step-33/CMakeLists.txt
@@ -42,9 +42,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_TRILINOS) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_TRILINOS = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-34/CMakeLists.txt b/examples/step-34/CMakeLists.txt
index 31a533fc155cfbf6f7fb306095c03a964c06496e..89380b49ce6642b6ae984336add7e62d44038175 100644 (file)
--- a/examples/step-34/CMakeLists.txt
+++ b/examples/step-34/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_MUPARSER) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_MUPARSER = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-35/CMakeLists.txt b/examples/step-35/CMakeLists.txt
index 51675073d3a3f6629fbc9efd6e6a1fb13799e282..d237740b3de79bf8219e3bb605659867a470556b 100644 (file)
--- a/examples/step-35/CMakeLists.txt
+++ b/examples/step-35/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_UMFPACK) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_UMFPACK = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-36/CMakeLists.txt b/examples/step-36/CMakeLists.txt
index dd2dabb7b80576efe58d6f6b329ea9daaeb4cbc8..93bb5f2e67b87d2a1b0ad403f5550afd029c8136 100644 (file)
--- a/examples/step-36/CMakeLists.txt
+++ b/examples/step-36/CMakeLists.txt
@@ -39,11 +39,11 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_PETSC OR NOT DEAL_II_WITH_SLEPC OR DEAL_II_PETSC_WITH_COMPLEX) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_PETSC = ON
     DEAL_II_WITH_SLEPC = ON
     DEAL_II_PETSC_WITH_COMPLEX = OFF
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-37/CMakeLists.txt b/examples/step-37/CMakeLists.txt
index b28db070c13d27a9a00ec635c74a484b6573dbea..8967be228f81ab4e192f76c031cd64a81dac67af 100644 (file)
--- a/examples/step-37/CMakeLists.txt
+++ b/examples/step-37/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_LAPACK) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_LAPACK = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-40/CMakeLists.txt b/examples/step-40/CMakeLists.txt
index 8f8a836c1c58b122aa1979d550178467e25b778c..b2f1967552aca4a0b4241a811779f2b71e895b10 100644 (file)
--- a/examples/step-40/CMakeLists.txt
+++ b/examples/step-40/CMakeLists.txt
@@ -39,7 +39,7 @@ ENDIF()
 #
 IF(NOT (DEAL_II_WITH_PETSC OR DEAL_II_WITH_TRILINOS) OR NOT DEAL_II_WITH_P4EST OR DEAL_II_PETSC_WITH_COMPLEX) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_PETSC = ON
     DEAL_II_PETSC_WITH_COMPLEX = OFF
     DEAL_II_WITH_P4EST = ON

diff --git a/examples/step-41/CMakeLists.txt b/examples/step-41/CMakeLists.txt
index f83fd51a702c6c1d3623b63fbb93fa90e2943c70..fd3d0c34ce071e20e695e57410fc7072cb875c3f 100644 (file)
--- a/examples/step-41/CMakeLists.txt
+++ b/examples/step-41/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_TRILINOS) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_TRILINOS = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-42/CMakeLists.txt b/examples/step-42/CMakeLists.txt
index aa242518c04959e5903bcc4d9a4ce3af478e4979..8a4f423bdf0251d4ca8adce3ff67994e4c6c9f64 100644 (file)
--- a/examples/step-42/CMakeLists.txt
+++ b/examples/step-42/CMakeLists.txt
@@ -42,11 +42,11 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_MPI OR NOT DEAL_II_WITH_P4EST OR NOT DEAL_II_WITH_TRILINOS) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_P4EST = ON
     DEAL_II_WITH_TRILINOS = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-43/CMakeLists.txt b/examples/step-43/CMakeLists.txt
index 2a9314b06aca83b56de2734926f0005ac9a4c105..9f85421c5338efcdf3dfc5e76045789f163f7ef5 100644 (file)
--- a/examples/step-43/CMakeLists.txt
+++ b/examples/step-43/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_TRILINOS) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_TRILINOS = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-45/CMakeLists.txt b/examples/step-45/CMakeLists.txt
index ef962839969f4439d1ee1a33a867addf5453e23e..543c6f52388a0238cb038c58517e9785a0ec193d 100644 (file)
--- a/examples/step-45/CMakeLists.txt
+++ b/examples/step-45/CMakeLists.txt
@@ -39,11 +39,11 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_MPI OR NOT DEAL_II_WITH_P4EST OR NOT DEAL_II_WITH_TRILINOS) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_P4EST = ON
     DEAL_II_WITH_TRILINOS = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-46/CMakeLists.txt b/examples/step-46/CMakeLists.txt
index b00d7b33509a7ec11221bdc56f1a2388e16ee585..5845e6703d3c284cd0251676efa31657a3e15966 100644 (file)
--- a/examples/step-46/CMakeLists.txt
+++ b/examples/step-46/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_UMFPACK) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_UMFPACK = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-50/CMakeLists.txt b/examples/step-50/CMakeLists.txt
index 627d2c12db6a527dcbef2ce7f9a1ade6cb4141a0..12c6ef131fa2d7bf5cb0323013b5c5e1ce2c1c5c 100644 (file)
--- a/examples/step-50/CMakeLists.txt
+++ b/examples/step-50/CMakeLists.txt
@@ -42,11 +42,11 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_MPI OR NOT DEAL_II_WITH_P4EST OR NOT DEAL_II_WITH_TRILINOS) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_P4EST = ON
     DEAL_II_WITH_TRILINOS = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-53/CMakeLists.txt b/examples/step-53/CMakeLists.txt
index 56aba24efbd8e329e12265dc031a3b08f0f3ca84..7074bd884faedd286f47cd2fc051cb0b514337e8 100644 (file)
--- a/examples/step-53/CMakeLists.txt
+++ b/examples/step-53/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_ZLIB) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
   DEAL_II_WITH_ZLIB = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-54/CMakeLists.txt b/examples/step-54/CMakeLists.txt
index 3a65dfb881fef612cec1a2cac63c291d78603428..361116343ffad20789c85d97ef722f16e4311840 100644 (file)
--- a/examples/step-54/CMakeLists.txt
+++ b/examples/step-54/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_OPENCASCADE) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_OPENCASCADE = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-55/CMakeLists.txt b/examples/step-55/CMakeLists.txt
index 4284ad44c9ccf60c6c53b6cac62274406a18486d..0226dc19d28af07622d803a48097e4cf53296f23 100644 (file)
--- a/examples/step-55/CMakeLists.txt
+++ b/examples/step-55/CMakeLists.txt
@@ -39,7 +39,7 @@ ENDIF()
 #
 IF(NOT (DEAL_II_WITH_PETSC OR DEAL_II_WITH_TRILINOS) OR NOT DEAL_II_WITH_P4EST OR DEAL_II_PETSC_WITH_COMPLEX) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_PETSC = ON
     DEAL_II_WITH_P4EST = ON
     DEAL_II_PETSC_WITH_COMPLEX = OFF

diff --git a/examples/step-56/CMakeLists.txt b/examples/step-56/CMakeLists.txt
index 29d73c4229e6c68fde0873b2639c210a6573eaec..e46d697bcb262c85d53163d25b0c7e79963b73da 100644 (file)
--- a/examples/step-56/CMakeLists.txt
+++ b/examples/step-56/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_UMFPACK) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_UMFPACK = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()
 

diff --git a/examples/step-57/CMakeLists.txt b/examples/step-57/CMakeLists.txt
index 6332bbc59f3469378f237ef02355097d7f1303be..3095d45dda9b241e9a82a2e450200c289caaa1e2 100644 (file)
--- a/examples/step-57/CMakeLists.txt
+++ b/examples/step-57/CMakeLists.txt
@@ -39,9 +39,9 @@ ENDIF()
 #
 IF(NOT DEAL_II_WITH_UMFPACK) # keep in one line
   MESSAGE(FATAL_ERROR "
-Error! The deal.II library found at ${DEAL_II_PATH} was not configured with
+Error! This tutorial requires a deal.II library that was configured with the following options:
     DEAL_II_WITH_UMFPACK = ON
-One or all of these are OFF in your installation but are required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
     )
 ENDIF()