Tutorial CMake error message now displays configured options.

diff --git a/examples/step-17/CMakeLists.txt b/examples/step-17/CMakeLists.txt
index 2fa04f67cc11c69714c6a2aee7e12b21f6262153..fdb60287ce00ddd82d1781f5a051df974ee1621d 100644 (file)
--- a/examples/step-17/CMakeLists.txt
+++ b/examples/step-17/CMakeLists.txt
@@ -43,7 +43,10 @@ IF(NOT DEAL_II_WITH_PETSC OR DEAL_II_PETSC_WITH_COMPLEX) # keep in one line
 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
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_PETSC = ${DEAL_II_WITH_PETSC}
+    DEAL_II_PETSC_WITH_COMPLEX = ${DEAL_II_PETSC_WITH_COMPLEX}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-18/CMakeLists.txt b/examples/step-18/CMakeLists.txt
index 7e8b7b442989c58b5a8c03e4a58afc2b86cd7f4a..122268bdb1049418a47daa3a58b750958d18606c 100644 (file)
--- a/examples/step-18/CMakeLists.txt
+++ b/examples/step-18/CMakeLists.txt
@@ -44,7 +44,11 @@ Error! This tutorial requires a deal.II library that was configured with the fol
     DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_PETSC = ON
     DEAL_II_PETSC_WITH_COMPLEX = OFF
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_MPI = ${DEAL_II_WITH_MPI}
+    DEAL_II_WITH_PETSC = ${DEAL_II_WITH_PETSC}
+    DEAL_II_PETSC_WITH_COMPLEX = ${DEAL_II_PETSC_WITH_COMPLEX}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-22/CMakeLists.txt b/examples/step-22/CMakeLists.txt
index 4af31ea07ab223d2e00b59ba6f4f55d23bfd2e3b..2fccdad8e83aebd73f35c2fcbab6570b849c6ee6 100644 (file)
--- a/examples/step-22/CMakeLists.txt
+++ b/examples/step-22/CMakeLists.txt
@@ -41,7 +41,9 @@ 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 options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_UMFPACK = ${DEAL_II_WITH_UMFPACK}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-29/CMakeLists.txt b/examples/step-29/CMakeLists.txt
index c31fb6ae9bd4c1c3b95dc6cf817780b1c8369cf1..cd95259d27e56b91e5fc9214ab0e88a62ff160dc 100644 (file)
--- a/examples/step-29/CMakeLists.txt
+++ b/examples/step-29/CMakeLists.txt
@@ -41,7 +41,9 @@ 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 options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_UMFPACK = ${DEAL_II_WITH_UMFPACK}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-31/CMakeLists.txt b/examples/step-31/CMakeLists.txt
index 59b1e7ffbd230d7eed677ce759f5c3d9a24131f7..fc9928924c96c7c5b5ec4b8f47e0575ea7c306ec 100644 (file)
--- a/examples/step-31/CMakeLists.txt
+++ b/examples/step-31/CMakeLists.txt
@@ -41,7 +41,9 @@ IF(NOT DEAL_II_WITH_TRILINOS) # 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_TRILINOS = ON
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_TRILINOS = ${DEAL_II_WITH_TRILINOS}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-32/CMakeLists.txt b/examples/step-32/CMakeLists.txt
index 5263a44f6f1f5cd5533d6f68ba0a0491e7ff5288..a7f13c9baab3c8264a8c177eab0cae526caf6c42 100644 (file)
--- a/examples/step-32/CMakeLists.txt
+++ b/examples/step-32/CMakeLists.txt
@@ -46,7 +46,11 @@ Error! This tutorial requires a deal.II library that was configured with the fol
     DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_P4EST = ON
     DEAL_II_WITH_TRILINOS = ON
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_MPI = ${DEAL_II_WITH_MPI}
+    DEAL_II_WITH_P4EST = ${DEAL_II_WITH_P4EST}
+    DEAL_II_WITH_TRILINOS = ${DEAL_II_WITH_TRILINOS}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-33/CMakeLists.txt b/examples/step-33/CMakeLists.txt
index 898ee500e02b3e78d80a8a6e966ea063f4948abe..7d979baeba67609666e78dcbc656d164e5e4a938 100644 (file)
--- a/examples/step-33/CMakeLists.txt
+++ b/examples/step-33/CMakeLists.txt
@@ -44,7 +44,9 @@ IF(NOT DEAL_II_WITH_TRILINOS) # 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_TRILINOS = ON
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_TRILINOS = ${DEAL_II_WITH_TRILINOS}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-34/CMakeLists.txt b/examples/step-34/CMakeLists.txt
index 89380b49ce6642b6ae984336add7e62d44038175..8000283474e093c327e58820f7b8706838b633b0 100644 (file)
--- a/examples/step-34/CMakeLists.txt
+++ b/examples/step-34/CMakeLists.txt
@@ -41,7 +41,9 @@ IF(NOT DEAL_II_WITH_MUPARSER) # 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_MUPARSER = ON
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_MUPARSER = ${DEAL_II_WITH_MUPARSER}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-35/CMakeLists.txt b/examples/step-35/CMakeLists.txt
index d237740b3de79bf8219e3bb605659867a470556b..a88f2d71cf63200d4f20267258db8f955eb8a502 100644 (file)
--- a/examples/step-35/CMakeLists.txt
+++ b/examples/step-35/CMakeLists.txt
@@ -41,7 +41,9 @@ 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 options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_UMFPACK = ${DEAL_II_WITH_UMFPACK}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-36/CMakeLists.txt b/examples/step-36/CMakeLists.txt
index 93bb5f2e67b87d2a1b0ad403f5550afd029c8136..dea42483f95ef583046691d0f5bf6abad57c4870 100644 (file)
--- a/examples/step-36/CMakeLists.txt
+++ b/examples/step-36/CMakeLists.txt
@@ -43,7 +43,11 @@ Error! This tutorial requires a deal.II library that was configured with the fol
     DEAL_II_WITH_PETSC = ON
     DEAL_II_WITH_SLEPC = ON
     DEAL_II_PETSC_WITH_COMPLEX = OFF
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_PETSC = ${DEAL_II_WITH_PETSC}
+    DEAL_II_WITH_SLEPC = ${DEAL_II_WITH_SLEPC}
+    DEAL_II_PETSC_WITH_COMPLEX = ${DEAL_II_PETSC_WITH_COMPLEX}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-37/CMakeLists.txt b/examples/step-37/CMakeLists.txt
index 8967be228f81ab4e192f76c031cd64a81dac67af..49d865106edcbbb018cc8248897811af5331b29b 100644 (file)
--- a/examples/step-37/CMakeLists.txt
+++ b/examples/step-37/CMakeLists.txt
@@ -41,7 +41,9 @@ 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 options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_LAPACK = ${DEAL_II_WITH_LAPACK}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-40/CMakeLists.txt b/examples/step-40/CMakeLists.txt
index b2f1967552aca4a0b4241a811779f2b71e895b10..90b1efa4f474e69e90107cac98a23dbdd97da3d0 100644 (file)
--- a/examples/step-40/CMakeLists.txt
+++ b/examples/step-40/CMakeLists.txt
@@ -46,7 +46,13 @@ Error! This tutorial requires a deal.II library that was configured with the fol
 or
     DEAL_II_WITH_TRILINOS = ON
     DEAL_II_WITH_P4EST = ON
-One or both of these combinations are OFF in your installation but at least one is required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_PETSC = ${DEAL_II_WITH_PETSC}
+    DEAL_II_PETSC_WITH_COMPLEX = ${DEAL_II_PETSC_WITH_COMPLEX}
+    DEAL_II_WITH_P4EST = ${DEAL_II_WITH_P4EST}
+    DEAL_II_WITH_TRILINOS = ${DEAL_II_WITH_TRILINOS}
+which conflict with the requirements.
+One or both of the aforementioned combinations of prerequisites are not met by your installation, but at least one is required for this tutorial step."
     )
 ENDIF()
 

diff --git a/examples/step-41/CMakeLists.txt b/examples/step-41/CMakeLists.txt
index fd3d0c34ce071e20e695e57410fc7072cb875c3f..bdd46250cc72ab346ee6ea61547f06c798db6380 100644 (file)
--- a/examples/step-41/CMakeLists.txt
+++ b/examples/step-41/CMakeLists.txt
@@ -41,7 +41,9 @@ IF(NOT DEAL_II_WITH_TRILINOS) # 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_TRILINOS = ON
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_TRILINOS = ${DEAL_II_WITH_TRILINOS}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-42/CMakeLists.txt b/examples/step-42/CMakeLists.txt
index 8a4f423bdf0251d4ca8adce3ff67994e4c6c9f64..34b9aab7cd76f93aa62dff966ec7535e73a7a5f1 100644 (file)
--- a/examples/step-42/CMakeLists.txt
+++ b/examples/step-42/CMakeLists.txt
@@ -46,7 +46,11 @@ Error! This tutorial requires a deal.II library that was configured with the fol
     DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_P4EST = ON
     DEAL_II_WITH_TRILINOS = ON
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_MPI = ${DEAL_II_WITH_MPI}
+    DEAL_II_WITH_P4EST = ${DEAL_II_WITH_P4EST}
+    DEAL_II_WITH_TRILINOS = ${DEAL_II_WITH_TRILINOS}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-43/CMakeLists.txt b/examples/step-43/CMakeLists.txt
index 9f85421c5338efcdf3dfc5e76045789f163f7ef5..d6911b6a788dbc989e540ba441ab5209d0a26bfd 100644 (file)
--- a/examples/step-43/CMakeLists.txt
+++ b/examples/step-43/CMakeLists.txt
@@ -41,7 +41,9 @@ IF(NOT DEAL_II_WITH_TRILINOS) # 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_TRILINOS = ON
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_TRILINOS = ${DEAL_II_WITH_TRILINOS}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-45/CMakeLists.txt b/examples/step-45/CMakeLists.txt
index 543c6f52388a0238cb038c58517e9785a0ec193d..84f29e20a1b81549063af807b552e7ebf0efcba4 100644 (file)
--- a/examples/step-45/CMakeLists.txt
+++ b/examples/step-45/CMakeLists.txt
@@ -43,7 +43,11 @@ Error! This tutorial requires a deal.II library that was configured with the fol
     DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_P4EST = ON
     DEAL_II_WITH_TRILINOS = ON
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_MPI = ${DEAL_II_WITH_MPI}
+    DEAL_II_WITH_P4EST = ${DEAL_II_WITH_P4EST}
+    DEAL_II_WITH_TRILINOS = ${DEAL_II_WITH_TRILINOS}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-46/CMakeLists.txt b/examples/step-46/CMakeLists.txt
index 5845e6703d3c284cd0251676efa31657a3e15966..84112d9a22195c497a8a3916927a49945fe8a6b1 100644 (file)
--- a/examples/step-46/CMakeLists.txt
+++ b/examples/step-46/CMakeLists.txt
@@ -41,7 +41,9 @@ 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 options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_UMFPACK = ${DEAL_II_WITH_UMFPACK}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-50/CMakeLists.txt b/examples/step-50/CMakeLists.txt
index 12c6ef131fa2d7bf5cb0323013b5c5e1ce2c1c5c..51e7e449ad3e135724d2d657247dd80074ee4d9c 100644 (file)
--- a/examples/step-50/CMakeLists.txt
+++ b/examples/step-50/CMakeLists.txt
@@ -46,7 +46,11 @@ Error! This tutorial requires a deal.II library that was configured with the fol
     DEAL_II_WITH_MPI = ON
     DEAL_II_WITH_P4EST = ON
     DEAL_II_WITH_TRILINOS = ON
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_MPI = ${DEAL_II_WITH_MPI}
+    DEAL_II_WITH_P4EST = ${DEAL_II_WITH_P4EST}
+    DEAL_II_WITH_TRILINOS = ${DEAL_II_WITH_TRILINOS}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-53/CMakeLists.txt b/examples/step-53/CMakeLists.txt
index 7074bd884faedd286f47cd2fc051cb0b514337e8..8a67e9d409e1f389cb56b7f939834b8386c07d62 100644 (file)
--- a/examples/step-53/CMakeLists.txt
+++ b/examples/step-53/CMakeLists.txt
@@ -41,7 +41,9 @@ IF(NOT DEAL_II_WITH_ZLIB) # 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_ZLIB = ON
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+  DEAL_II_WITH_ZLIB = ${DEAL_II_WITH_ZLIB}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-54/CMakeLists.txt b/examples/step-54/CMakeLists.txt
index 361116343ffad20789c85d97ef722f16e4311840..3b5ca8d6c45579632b317506294533772696bb90 100644 (file)
--- a/examples/step-54/CMakeLists.txt
+++ b/examples/step-54/CMakeLists.txt
@@ -41,7 +41,9 @@ IF(NOT DEAL_II_WITH_OPENCASCADE) # 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_OPENCASCADE = ON
-However, the deal.II library found at ${DEAL_II_PATH} was configured with options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_OPENCASCADE = ${DEAL_II_WITH_OPENCASCADE}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-55/CMakeLists.txt b/examples/step-55/CMakeLists.txt
index 0226dc19d28af07622d803a48097e4cf53296f23..97845e428f4207633c47266b87bd43aed4893813 100644 (file)
--- a/examples/step-55/CMakeLists.txt
+++ b/examples/step-55/CMakeLists.txt
@@ -41,12 +41,18 @@ IF(NOT (DEAL_II_WITH_PETSC OR DEAL_II_WITH_TRILINOS) OR NOT DEAL_II_WITH_P4EST O
   MESSAGE(FATAL_ERROR "
 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
+    DEAL_II_WITH_P4EST = ON
 or
     DEAL_II_WITH_TRILINOS = ON
     DEAL_II_WITH_P4EST = ON
-One or both of these combinations are OFF in your installation but at least one is required for this tutorial step."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_PETSC = ${DEAL_II_WITH_PETSC}
+    DEAL_II_PETSC_WITH_COMPLEX = ${DEAL_II_PETSC_WITH_COMPLEX}
+    DEAL_II_WITH_P4EST = ${DEAL_II_WITH_P4EST}
+    DEAL_II_WITH_TRILINOS = ${DEAL_II_WITH_TRILINOS}
+which conflict with the requirements.
+One or both of the aforementioned combinations of prerequisites are not met by your installation, but at least one is required for this tutorial step."
     )
 ENDIF()
 

diff --git a/examples/step-56/CMakeLists.txt b/examples/step-56/CMakeLists.txt
index e46d697bcb262c85d53163d25b0c7e79963b73da..1ed514d2726a041082c6e252f20ec60f25a497ed 100644 (file)
--- a/examples/step-56/CMakeLists.txt
+++ b/examples/step-56/CMakeLists.txt
@@ -41,7 +41,9 @@ 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 options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_UMFPACK = ${DEAL_II_WITH_UMFPACK}
+which conflict with the requirements."
     )
 ENDIF()
 

diff --git a/examples/step-57/CMakeLists.txt b/examples/step-57/CMakeLists.txt
index 3095d45dda9b241e9a82a2e450200c289caaa1e2..b15c12f06fa63367beb0881b18680118f0220b4d 100644 (file)
--- a/examples/step-57/CMakeLists.txt
+++ b/examples/step-57/CMakeLists.txt
@@ -41,7 +41,9 @@ 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 options that conflict with these requirements."
+However, the deal.II library found at ${DEAL_II_PATH} was configured with these options
+    DEAL_II_WITH_UMFPACK = ${DEAL_II_WITH_UMFPACK}
+which conflict with the requirements."
     )
 ENDIF()