From: Daniel Arndt Date: Tue, 9 Oct 2018 13:30:12 +0000 (+0200) Subject: Restrict examples that require a working FunctionParser class X-Git-Tag: v9.1.0-rc1~642^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7311%2Fhead;p=dealii.git Restrict examples that require a working FunctionParser class --- diff --git a/examples/step-33/CMakeLists.txt b/examples/step-33/CMakeLists.txt index a00a050041..3f055754f9 100644 --- a/examples/step-33/CMakeLists.txt +++ b/examples/step-33/CMakeLists.txt @@ -40,11 +40,13 @@ ENDIF() # # Are all dependencies fulfilled? # -IF(NOT DEAL_II_TRILINOS_WITH_SACADO) # keep in one line +IF(NOT DEAL_II_TRILINOS_WITH_SACADO OR 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 DEAL_II_TRILINOS_WITH_SACADO = ON 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." ) diff --git a/examples/step-60/CMakeLists.txt b/examples/step-60/CMakeLists.txt index 99bfe40e4d..b76c254ae9 100644 --- a/examples/step-60/CMakeLists.txt +++ b/examples/step-60/CMakeLists.txt @@ -37,11 +37,13 @@ ENDIF() # # Are all dependencies fulfilled? # -IF(NOT DEAL_II_WITH_UMFPACK) # keep in one line +IF(NOT DEAL_II_WITH_UMFPACK OR 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 DEAL_II_WITH_UMFPACK = ON 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." )