From 996a4db7153fe4b6475508e0aae2af3289a9bffe Mon Sep 17 00:00:00 2001 From: Jean-Paul Pelteret Date: Mon, 17 Jul 2017 09:08:10 +0200 Subject: [PATCH] Update CMake error message in tutorials. This removes any ambiguity in the outputted message previously caused by double negation. Fixes #4600 --- examples/step-17/CMakeLists.txt | 4 ++-- examples/step-18/CMakeLists.txt | 4 ++-- examples/step-22/CMakeLists.txt | 4 ++-- examples/step-29/CMakeLists.txt | 4 ++-- examples/step-31/CMakeLists.txt | 4 ++-- examples/step-32/CMakeLists.txt | 4 ++-- examples/step-33/CMakeLists.txt | 4 ++-- examples/step-34/CMakeLists.txt | 4 ++-- examples/step-35/CMakeLists.txt | 4 ++-- examples/step-36/CMakeLists.txt | 4 ++-- examples/step-37/CMakeLists.txt | 4 ++-- examples/step-40/CMakeLists.txt | 2 +- examples/step-41/CMakeLists.txt | 4 ++-- examples/step-42/CMakeLists.txt | 4 ++-- examples/step-43/CMakeLists.txt | 4 ++-- examples/step-45/CMakeLists.txt | 4 ++-- examples/step-46/CMakeLists.txt | 4 ++-- examples/step-50/CMakeLists.txt | 4 ++-- examples/step-53/CMakeLists.txt | 4 ++-- examples/step-54/CMakeLists.txt | 4 ++-- examples/step-55/CMakeLists.txt | 2 +- examples/step-56/CMakeLists.txt | 4 ++-- examples/step-57/CMakeLists.txt | 4 ++-- 23 files changed, 44 insertions(+), 44 deletions(-) diff --git a/examples/step-17/CMakeLists.txt b/examples/step-17/CMakeLists.txt index a3450daf25..2fa04f67cc 100644 --- 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 8413167a4d..7e8b7b4429 100644 --- 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 6a8e526fdf..4af31ea07a 100644 --- 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 493238c104..c31fb6ae9b 100644 --- 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 6eda1768bb..59b1e7ffbd 100644 --- 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 c9edf97193..5263a44f6f 100644 --- 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 ddc51a6579..898ee500e0 100644 --- 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 31a533fc15..89380b49ce 100644 --- 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 51675073d3..d237740b3d 100644 --- 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 dd2dabb7b8..93bb5f2e67 100644 --- 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 b28db070c1..8967be228f 100644 --- 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 8f8a836c1c..b2f1967552 100644 --- 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 f83fd51a70..fd3d0c34ce 100644 --- 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 aa242518c0..8a4f423bdf 100644 --- 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 2a9314b06a..9f85421c53 100644 --- 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 ef96283996..543c6f5238 100644 --- 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 b00d7b3350..5845e6703d 100644 --- 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 627d2c12db..12c6ef131f 100644 --- 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 56aba24efb..7074bd884f 100644 --- 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 3a65dfb881..361116343f 100644 --- 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 4284ad44c9..0226dc19d2 100644 --- 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 29d73c4229..e46d697bcb 100644 --- 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 6332bbc59f..3095d45dda 100644 --- 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() -- 2.39.5