From: Wolfgang Bangerth Date: Sun, 14 Mar 2021 15:15:18 +0000 (+0100) Subject: Fix grammar. X-Git-Tag: v9.3.0-rc1~329^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05e99ec56ebaca5cde847d159f47316339e2cbe0;p=dealii.git Fix grammar. --- diff --git a/examples/step-17/CMakeLists.txt b/examples/step-17/CMakeLists.txt index f2d615d153..a642111c8e 100644 --- a/examples/step-17/CMakeLists.txt +++ b/examples/step-17/CMakeLists.txt @@ -43,10 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-18/CMakeLists.txt b/examples/step-18/CMakeLists.txt index 3a4b8f0669..56eced9b62 100644 --- a/examples/step-18/CMakeLists.txt +++ b/examples/step-18/CMakeLists.txt @@ -44,11 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-22/CMakeLists.txt b/examples/step-22/CMakeLists.txt index ba5d70bc93..236104083c 100644 --- a/examples/step-22/CMakeLists.txt +++ b/examples/step-22/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-29/CMakeLists.txt b/examples/step-29/CMakeLists.txt index 5dea12fbdc..af8ac7e7e9 100644 --- a/examples/step-29/CMakeLists.txt +++ b/examples/step-29/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-31/CMakeLists.txt b/examples/step-31/CMakeLists.txt index 31f7543491..25fcd0010e 100644 --- a/examples/step-31/CMakeLists.txt +++ b/examples/step-31/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-32/CMakeLists.txt b/examples/step-32/CMakeLists.txt index e1c37917c6..bc17e58f26 100644 --- a/examples/step-32/CMakeLists.txt +++ b/examples/step-32/CMakeLists.txt @@ -46,11 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-33/CMakeLists.txt b/examples/step-33/CMakeLists.txt index 45184c0a71..6bce17a33d 100644 --- a/examples/step-33/CMakeLists.txt +++ b/examples/step-33/CMakeLists.txt @@ -45,10 +45,10 @@ IF(NOT DEAL_II_TRILINOS_WITH_SACADO OR NOT DEAL_II_WITH_MUPARSER) # keep in one Error! This tutorial requires a deal.II library that was configured with the following options: DEAL_II_WITH_MUPARSER = ON DEAL_II_TRILINOS_WITH_SACADO = ON -However, the deal.II library found at ${DEAL_II_PATH} was configured with these options +However, the deal.II library found at ${DEAL_II_PATH} was configured with these options: DEAL_II_WITH_MUPARSER = ${DEAL_II_WITH_MUPARSER} DEAL_II_TRILINOS_WITH_SACADO = ${DEAL_II_TRILINOS_WITH_SACADO} -which conflict with the requirements." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-34/CMakeLists.txt b/examples/step-34/CMakeLists.txt index f9b0a96b5e..bfc6ecc370 100644 --- a/examples/step-34/CMakeLists.txt +++ b/examples/step-34/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-35/CMakeLists.txt b/examples/step-35/CMakeLists.txt index 87972b56dd..295cbcdf8e 100644 --- a/examples/step-35/CMakeLists.txt +++ b/examples/step-35/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-36/CMakeLists.txt b/examples/step-36/CMakeLists.txt index 0b4da96d98..132dda1638 100644 --- a/examples/step-36/CMakeLists.txt +++ b/examples/step-36/CMakeLists.txt @@ -43,11 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-37/CMakeLists.txt b/examples/step-37/CMakeLists.txt index 46c5ca3867..30f681fa69 100644 --- a/examples/step-37/CMakeLists.txt +++ b/examples/step-37/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-40/CMakeLists.txt b/examples/step-40/CMakeLists.txt index d81dab1baf..1f528f3fb6 100644 --- a/examples/step-40/CMakeLists.txt +++ b/examples/step-40/CMakeLists.txt @@ -46,12 +46,12 @@ 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 -However, the deal.II library found at ${DEAL_II_PATH} was configured with these options +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. +This conflicts 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 2c5b437ab7..a71201ae3c 100644 --- a/examples/step-41/CMakeLists.txt +++ b/examples/step-41/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-42/CMakeLists.txt b/examples/step-42/CMakeLists.txt index 2553d87cfa..252aa13249 100644 --- a/examples/step-42/CMakeLists.txt +++ b/examples/step-42/CMakeLists.txt @@ -46,11 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-43/CMakeLists.txt b/examples/step-43/CMakeLists.txt index 2f04aa2e43..74f7908377 100644 --- a/examples/step-43/CMakeLists.txt +++ b/examples/step-43/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-45/CMakeLists.txt b/examples/step-45/CMakeLists.txt index 02a230d842..ed5a5d751f 100644 --- a/examples/step-45/CMakeLists.txt +++ b/examples/step-45/CMakeLists.txt @@ -43,11 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-46/CMakeLists.txt b/examples/step-46/CMakeLists.txt index c69e054b2a..c258fc5e43 100644 --- a/examples/step-46/CMakeLists.txt +++ b/examples/step-46/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-50/CMakeLists.txt b/examples/step-50/CMakeLists.txt index 4c29eba8c3..bbbf4feab2 100644 --- a/examples/step-50/CMakeLists.txt +++ b/examples/step-50/CMakeLists.txt @@ -49,12 +49,12 @@ 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 -However, the deal.II library found at ${DEAL_II_PATH} was configured with these options +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. +This conflicts 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-52/CMakeLists.txt b/examples/step-52/CMakeLists.txt index efd061bac1..db66635812 100644 --- a/examples/step-52/CMakeLists.txt +++ b/examples/step-52/CMakeLists.txt @@ -44,9 +44,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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-53/CMakeLists.txt b/examples/step-53/CMakeLists.txt index 7df26096f2..ceed1f468e 100644 --- a/examples/step-53/CMakeLists.txt +++ b/examples/step-53/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-54/CMakeLists.txt b/examples/step-54/CMakeLists.txt index 3ff7177441..3d5c5d3dbd 100644 --- a/examples/step-54/CMakeLists.txt +++ b/examples/step-54/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-55/CMakeLists.txt b/examples/step-55/CMakeLists.txt index 5c731652a9..eb8710a21b 100644 --- a/examples/step-55/CMakeLists.txt +++ b/examples/step-55/CMakeLists.txt @@ -46,12 +46,12 @@ 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 -However, the deal.II library found at ${DEAL_II_PATH} was configured with these options +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. +This conflicts 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 6ea8d21f93..efbc429532 100644 --- a/examples/step-56/CMakeLists.txt +++ b/examples/step-56/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-57/CMakeLists.txt b/examples/step-57/CMakeLists.txt index e38e8bb995..18f58d3ba8 100644 --- a/examples/step-57/CMakeLists.txt +++ b/examples/step-57/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-58/CMakeLists.txt b/examples/step-58/CMakeLists.txt index 6b610be76c..bfdcb64e30 100644 --- a/examples/step-58/CMakeLists.txt +++ b/examples/step-58/CMakeLists.txt @@ -42,10 +42,10 @@ IF(NOT (DEAL_II_WITH_UMFPACK AND DEAL_II_WITH_COMPLEX_VALUES)) # keep in one lin Error! This tutorial requires a deal.II library that was configured with the following options: DEAL_II_WITH_UMFPACK = ON DEAL_II_WITH_COMPLEX_VALUES = ON -However, the deal.II library found at ${DEAL_II_PATH} was configured with these options +However, the deal.II library found at ${DEAL_II_PATH} was configured with these options: DEAL_II_WITH_UMFPACK = ${DEAL_II_WITH_UMFPACK} DEAL_II_WITH_COMPLEX_VALUES = ${DEAL_II_WITH_COMPLEX_VALUES} -which conflict with the requirements." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-59/CMakeLists.txt b/examples/step-59/CMakeLists.txt index e1743d70ed..ba1f148e12 100644 --- a/examples/step-59/CMakeLists.txt +++ b/examples/step-59/CMakeLists.txt @@ -41,9 +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 these options +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." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-60/CMakeLists.txt b/examples/step-60/CMakeLists.txt index 9ebb9754b0..6eff58392b 100644 --- a/examples/step-60/CMakeLists.txt +++ b/examples/step-60/CMakeLists.txt @@ -42,10 +42,10 @@ IF(NOT DEAL_II_WITH_UMFPACK OR NOT DEAL_II_WITH_MUPARSER) # keep in one line Error! This tutorial requires a deal.II library that was configured with the following options: DEAL_II_WITH_MUPARSER = ON DEAL_II_WITH_UMFPACK = ON -However, the deal.II library found at ${DEAL_II_PATH} was configured with these options +However, the deal.II library found at ${DEAL_II_PATH} was configured with these options: DEAL_II_WITH_MUPARSER = ${DEAL_II_WITH_MUPARSER} DEAL_II_WITH_UMFPACK = ${DEAL_II_WITH_UMFPACK} -which conflict with the requirements." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-62/CMakeLists.txt b/examples/step-62/CMakeLists.txt index fd2343256b..a5b7dbd133 100644 --- a/examples/step-62/CMakeLists.txt +++ b/examples/step-62/CMakeLists.txt @@ -44,12 +44,12 @@ Error! This tutorial requires a deal.II library that was configured with the fol DEAL_II_PETSC_WITH_COMPLEX = ON DEAL_II_WITH_P4EST = ON DEAL_II_WITH_HDF5 = ON -However, the deal.II library found at ${DEAL_II_PATH} was configured with these options +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_HDF5 = ${DEAL_II_WITH_HDF5} -which conflict with the requirements. +This conflicts 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-64/CMakeLists.txt b/examples/step-64/CMakeLists.txt index 172c607168..627b21b270 100644 --- a/examples/step-64/CMakeLists.txt +++ b/examples/step-64/CMakeLists.txt @@ -43,11 +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_CUDA = ON -However, the deal.II library found at ${DEAL_II_PATH} was configured with these options +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_CUDA = ${DEAL_II_WITH_CUDA} -which conflict with the requirements." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-68/CMakeLists.txt b/examples/step-68/CMakeLists.txt index 4d49311653..4098827eae 100644 --- a/examples/step-68/CMakeLists.txt +++ b/examples/step-68/CMakeLists.txt @@ -41,9 +41,9 @@ IF(NOT DEAL_II_WITH_P4EST) # 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_P4EST = ON -However, the deal.II library found at ${DEAL_II_PATH} was configured with these options +However, the deal.II library found at ${DEAL_II_PATH} was configured with these options: DEAL_II_WITH_P4EST = ${DEAL_II_WITH_P4EST} -which conflict with the requirements." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-69/CMakeLists.txt b/examples/step-69/CMakeLists.txt index 8e3fd0ee45..037a70dae8 100644 --- a/examples/step-69/CMakeLists.txt +++ b/examples/step-69/CMakeLists.txt @@ -42,10 +42,10 @@ IF(NOT DEAL_II_WITH_MPI OR NOT DEAL_II_WITH_P4EST) # keep in one line 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 -However, the deal.II library found at ${DEAL_II_PATH} was configured with these options +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} -which conflict with the requirements." +This conflicts with the requirements." ) ENDIF() diff --git a/examples/step-70/CMakeLists.txt b/examples/step-70/CMakeLists.txt index 7ba10ac49a..e1e98dbb08 100644 --- a/examples/step-70/CMakeLists.txt +++ b/examples/step-70/CMakeLists.txt @@ -46,12 +46,12 @@ 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 -However, the deal.II library found at ${DEAL_II_PATH} was configured with these options +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. +This conflicts 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()