From: bangerth Date: Thu, 10 Jan 2013 23:26:37 +0000 (+0000) Subject: Re-order checks for satisfied preconditions. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1606c81395e6baabd90847d03fd87c6996cfe1e;p=dealii-svn.git Re-order checks for satisfied preconditions. git-svn-id: https://svn.dealii.org/branches/branch_cmake@28007 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/examples/step-17/CMakeLists.txt b/deal.II/examples/step-17/CMakeLists.txt index 822ab605db..a249dcbea9 100644 --- a/deal.II/examples/step-17/CMakeLists.txt +++ b/deal.II/examples/step-17/CMakeLists.txt @@ -28,15 +28,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_PETSC OR DEAL_II_WITH_THREADS) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_PETSC = ON - DEAL_II_WITH_THREADS = OFF -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -46,6 +37,15 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_PETSC OR DEAL_II_WITH_THREADS) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_PETSC = ON + DEAL_II_WITH_THREADS = OFF +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-18/CMakeLists.txt b/deal.II/examples/step-18/CMakeLists.txt index 8334072baa..aedf3ff7d5 100644 --- a/deal.II/examples/step-18/CMakeLists.txt +++ b/deal.II/examples/step-18/CMakeLists.txt @@ -28,15 +28,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_PETSC OR DEAL_II_WITH_THREADS) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_PETSC = ON - DEAL_II_WITH_THREADS = OFF -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -46,6 +37,15 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_PETSC OR DEAL_II_WITH_THREADS) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_PETSC = ON + DEAL_II_WITH_THREADS = OFF +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-22/CMakeLists.txt b/deal.II/examples/step-22/CMakeLists.txt index d69fa643a9..9257bcf203 100644 --- a/deal.II/examples/step-22/CMakeLists.txt +++ b/deal.II/examples/step-22/CMakeLists.txt @@ -28,14 +28,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_UMFPACK) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_UMFPACK = ON -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -45,6 +37,14 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_UMFPACK) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_UMFPACK = ON +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-29/CMakeLists.txt b/deal.II/examples/step-29/CMakeLists.txt index bc905ad0a2..08705f595e 100644 --- a/deal.II/examples/step-29/CMakeLists.txt +++ b/deal.II/examples/step-29/CMakeLists.txt @@ -28,14 +28,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_UMFPACK) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_UMFPACK = ON -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -45,6 +37,14 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_UMFPACK) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_UMFPACK = ON +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-31/CMakeLists.txt b/deal.II/examples/step-31/CMakeLists.txt index 17a0a270b7..ab48ce4ddb 100644 --- a/deal.II/examples/step-31/CMakeLists.txt +++ b/deal.II/examples/step-31/CMakeLists.txt @@ -28,14 +28,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_TRILINOS) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_TRILINOS = ON -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -45,6 +37,14 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_TRILINOS) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_TRILINOS = ON +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-32/CMakeLists.txt b/deal.II/examples/step-32/CMakeLists.txt index 8d63d9a110..3170071e3d 100644 --- a/deal.II/examples/step-32/CMakeLists.txt +++ b/deal.II/examples/step-32/CMakeLists.txt @@ -34,6 +34,15 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # +IF (NOT ${deal.II_FOUND}) + MESSAGE(FATAL_ERROR + "\n\n" + " *** Could not locate deal.II. *** " + "\n\n" + " *** You may want to either pass the -DDEAL_II_DIR=/path/to/deal.II flag to cmake \n" + " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") +ENDIF () + IF( NOT DEAL_II_WITH_MPI OR NOT DEAL_II_WITH_P4EST OR NOT DEAL_II_WITH_TRILINOS ) @@ -46,15 +55,6 @@ which is required for this tutorial step." ) ENDIF() -IF (NOT ${deal.II_FOUND}) - MESSAGE(FATAL_ERROR - "\n\n" - " *** Could not locate deal.II. *** " - "\n\n" - " *** You may want to either pass the -DDEAL_II_DIR=/path/to/deal.II flag to cmake \n" - " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") -ENDIF () - DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-33/CMakeLists.txt b/deal.II/examples/step-33/CMakeLists.txt index ea0d5da539..597ba261a6 100644 --- a/deal.II/examples/step-33/CMakeLists.txt +++ b/deal.II/examples/step-33/CMakeLists.txt @@ -31,14 +31,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_TRILINOS) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_TRILINOS = ON -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -48,6 +40,14 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_TRILINOS) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_TRILINOS = ON +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-34/CMakeLists.txt b/deal.II/examples/step-34/CMakeLists.txt index 84a79b3e47..f368e8f131 100644 --- a/deal.II/examples/step-34/CMakeLists.txt +++ b/deal.II/examples/step-34/CMakeLists.txt @@ -28,14 +28,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_FUNCTIONPARSER) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_FUNCTIONPARSER = ON -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -45,6 +37,14 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_FUNCTIONPARSER) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_FUNCTIONPARSER = ON +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-35/CMakeLists.txt b/deal.II/examples/step-35/CMakeLists.txt index 6a6e9d9361..54fdcf8bae 100644 --- a/deal.II/examples/step-35/CMakeLists.txt +++ b/deal.II/examples/step-35/CMakeLists.txt @@ -28,14 +28,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_UMFPACK) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_UMFPACK = ON -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -45,6 +37,14 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_UMFPACK) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_UMFPACK = ON +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-36/CMakeLists.txt b/deal.II/examples/step-36/CMakeLists.txt index 21bc54bb34..7d3dada49a 100644 --- a/deal.II/examples/step-36/CMakeLists.txt +++ b/deal.II/examples/step-36/CMakeLists.txt @@ -28,6 +28,15 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # +IF (NOT ${deal.II_FOUND}) + MESSAGE(FATAL_ERROR + "\n\n" + " *** Could not locate deal.II. *** " + "\n\n" + " *** You may want to either pass the -DDEAL_II_DIR=/path/to/deal.II flag to cmake \n" + " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") +ENDIF () + IF(NOT DEAL_II_WITH_PETSC OR NOT DEAL_II_WITH_SLEPC OR DEAL_II_WITH_THREADS) MESSAGE(FATAL_ERROR " Error! The deal.II library found at ${DEAL_II_PATH} was not configured with @@ -38,15 +47,6 @@ which is required for this tutorial step." ) ENDIF() -IF (NOT ${deal.II_FOUND}) - MESSAGE(FATAL_ERROR - "\n\n" - " *** Could not locate deal.II. *** " - "\n\n" - " *** You may want to either pass the -DDEAL_II_DIR=/path/to/deal.II flag to cmake \n" - " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") -ENDIF () - DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-37/CMakeLists.txt b/deal.II/examples/step-37/CMakeLists.txt index 2552771e41..6cb0198de0 100644 --- a/deal.II/examples/step-37/CMakeLists.txt +++ b/deal.II/examples/step-37/CMakeLists.txt @@ -28,14 +28,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_LAPACK) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_LAPACK = ON -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -45,6 +37,14 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_LAPACK) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_LAPACK = ON +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-40/CMakeLists.txt b/deal.II/examples/step-40/CMakeLists.txt index 12f6652aff..f748a7dd61 100644 --- a/deal.II/examples/step-40/CMakeLists.txt +++ b/deal.II/examples/step-40/CMakeLists.txt @@ -28,6 +28,15 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # +IF (NOT ${deal.II_FOUND}) + MESSAGE(FATAL_ERROR + "\n\n" + " *** Could not locate deal.II. *** " + "\n\n" + " *** You may want to either pass the -DDEAL_II_DIR=/path/to/deal.II flag to cmake \n" + " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") +ENDIF () + IF(NOT DEAL_II_WITH_PETSC OR NOT DEAL_II_WITH_P4EST OR DEAL_II_WITH_THREADS) MESSAGE(FATAL_ERROR " Error! The deal.II library found at ${DEAL_II_PATH} was not configured with @@ -38,15 +47,6 @@ which is required for this tutorial step." ) ENDIF() -IF (NOT ${deal.II_FOUND}) - MESSAGE(FATAL_ERROR - "\n\n" - " *** Could not locate deal.II. *** " - "\n\n" - " *** You may want to either pass the -DDEAL_II_DIR=/path/to/deal.II flag to cmake \n" - " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") -ENDIF () - DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-41/CMakeLists.txt b/deal.II/examples/step-41/CMakeLists.txt index 90f8174114..a863ecf1ff 100644 --- a/deal.II/examples/step-41/CMakeLists.txt +++ b/deal.II/examples/step-41/CMakeLists.txt @@ -28,14 +28,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_TRILINOS) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_TRILINOS = ON -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -45,6 +37,14 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_TRILINOS) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_TRILINOS = ON +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-42/CMakeLists.txt b/deal.II/examples/step-42/CMakeLists.txt index d2487744bd..0063fc00a3 100644 --- a/deal.II/examples/step-42/CMakeLists.txt +++ b/deal.II/examples/step-42/CMakeLists.txt @@ -34,6 +34,15 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # +IF (NOT ${deal.II_FOUND}) + MESSAGE(FATAL_ERROR + "\n\n" + " *** Could not locate deal.II. *** " + "\n\n" + " *** You may want to either pass the -DDEAL_II_DIR=/path/to/deal.II flag to cmake \n" + " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") +ENDIF () + IF( NOT DEAL_II_WITH_MPI OR NOT DEAL_II_WITH_P4EST OR NOT DEAL_II_WITH_TRILINOS ) @@ -46,15 +55,6 @@ which is required for this tutorial step." ) ENDIF() -IF (NOT ${deal.II_FOUND}) - MESSAGE(FATAL_ERROR - "\n\n" - " *** Could not locate deal.II. *** " - "\n\n" - " *** You may want to either pass the -DDEAL_II_DIR=/path/to/deal.II flag to cmake \n" - " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") -ENDIF () - DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-43/CMakeLists.txt b/deal.II/examples/step-43/CMakeLists.txt index 1080411cc4..332be155c8 100644 --- a/deal.II/examples/step-43/CMakeLists.txt +++ b/deal.II/examples/step-43/CMakeLists.txt @@ -28,14 +28,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_TRILINOS) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_TRILINOS = ON -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -45,6 +37,14 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_TRILINOS) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_TRILINOS = ON +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT() diff --git a/deal.II/examples/step-46/CMakeLists.txt b/deal.II/examples/step-46/CMakeLists.txt index 165ae5f5ef..30bb9d1d6c 100644 --- a/deal.II/examples/step-46/CMakeLists.txt +++ b/deal.II/examples/step-46/CMakeLists.txt @@ -28,14 +28,6 @@ FIND_PACKAGE(deal.II 8.0 QUIET # # Are all dependencies fullfilled? # -IF(NOT DEAL_II_WITH_UMFPACK) - MESSAGE(FATAL_ERROR " -Error! The deal.II library found at ${DEAL_II_PATH} was not configured with - DEAL_II_WITH_UMFPACK = ON -which is required for this tutorial step." - ) -ENDIF() - IF (NOT ${deal.II_FOUND}) MESSAGE(FATAL_ERROR "\n\n" @@ -45,6 +37,14 @@ IF (NOT ${deal.II_FOUND}) " *** or set an environment variable \"DEAL_II_DIR\" that contains this path.") ENDIF () +IF(NOT DEAL_II_WITH_UMFPACK) + MESSAGE(FATAL_ERROR " +Error! The deal.II library found at ${DEAL_II_PATH} was not configured with + DEAL_II_WITH_UMFPACK = ON +which is required for this tutorial step." + ) +ENDIF() + DEAL_II_INITIALIZE_CACHED_VARIABLES() PROJECT(${TARGET}) DEAL_II_INVOKE_AUTOPILOT()