Restrict examples that require a working FunctionParser class

diff --git a/examples/step-33/CMakeLists.txt b/examples/step-33/CMakeLists.txt
index a00a050041b9d2e51e377dc2e4872622e63cbda8..3f055754f96c2a338b9749b828a3ab1c6049d0fe 100644 (file)
--- 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 99bfe40e4de31ebce60e6f107c76579c56e78b6b..b76c254ae93f8dca9a5b4e7ea2d73afb71faa1db 100644 (file)
--- 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."
     )