Update documentation of DEAL_II_WITH_* lists, and testsuite configuration

diff --git a/cmake/config/CMakeLists.txt b/cmake/config/CMakeLists.txt
index dce4498ca087a8ca893e22901ec1c00ae54e6759..6e16425db15f0447ef463a9502b902ea3ca2981d 100644 (file)
--- a/cmake/config/CMakeLists.txt
+++ b/cmake/config/CMakeLists.txt
@@ -1,6 +1,6 @@
 ## ---------------------------------------------------------------------
 ##
-## Copyright (C) 2012 - 2013 by the deal.II authors
+## Copyright (C) 2012 - 2014 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -323,7 +323,7 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES)
   # yes, as is common for Makefiles.
   #
   COND_SET_TO_YES(DEAL_II_WITH_THREADS MAKEFILE_enablethreads)
-  COND_SET_TO_YES(DEAL_II_WITH_FUNCTIONPARSER MAKEFILE_enableparser)
+  COND_SET_TO_YES(DEAL_II_WITH_MUPARSER MAKEFILE_enableparser)
   COND_SET_TO_YES(BUILD_SHARED_LIBS MAKEFILE_enableshared)
 
   COND_SET_TO_YES(DEAL_II_WITH_ARPACK MAKEFILE_ARPACK)

diff --git a/doc/users/cmake.html b/doc/users/cmake.html
index 75a2e9b59a582c1513737d94f33bf9ad9e651ca7..bf3a538b73ab094545088461cfb90f5fbee0d105 100644 (file)
--- a/doc/users/cmake.html
+++ b/doc/users/cmake.html
@@ -443,15 +443,19 @@ parameter_gui  - builds and installs the 'parameter_gui' component
       Specifically, the following variables exist (the list may grow
       over time, but names are standardized):
 <pre class="cmake">
+DEAL_II_WITH_64BIT_INDICES
 DEAL_II_WITH_ARPACK
 DEAL_II_WITH_BOOST
-DEAL_II_WITH_FUNCTIONPARSER
+DEAL_II_WITH_BZIP2
+DEAL_II_WITH_CXX11
+DEAL_II_WITH_HDF5
 DEAL_II_WITH_LAPACK
 DEAL_II_WITH_METIS
+DEAL_II_WITH_MPI
 DEAL_II_WITH_MUMPS
 DEAL_II_WITH_MUPARSER
-DEAL_II_WITH_MPI
 DEAL_II_WITH_NETCDF
+DEAL_II_WITH_OPENCASCADE
 DEAL_II_WITH_P4EST
 DEAL_II_WITH_PETSC
 DEAL_II_WITH_SLEPC
@@ -459,7 +463,6 @@ DEAL_II_WITH_THREADS
 DEAL_II_WITH_TRILINOS
 DEAL_II_WITH_UMFPACK
 DEAL_II_WITH_ZLIB
-DEAL_II_WITH_64BIT_INDICES
 </pre>
       They all have standard meaning with the exception of
       two:
@@ -497,7 +500,7 @@ DEAL_II_WITH_64BIT_INDICES
           </p>
         <li>
           <p>
-            <code>DEAL_II_FORCE_BUNDLED_(BOOST|FUNCTIONPARSER|THREADS|UMFPACK)</code>:
+            <code>DEAL_II_FORCE_BUNDLED_(BOOST|MUPARSER|THREADS|UMFPACK)</code>:
           </p>
           <p>
             Forces the use of the bundled library regardless whether

diff --git a/doc/users/cmakelists.html b/doc/users/cmakelists.html
index 9423d462962349a54ab5d27a4e0f5a7ff114fb17..a0bfb3f17b81de89abad34d5591424a3a6d9b1d0 100644 (file)
--- a/doc/users/cmakelists.html
+++ b/doc/users/cmakelists.html
@@ -789,7 +789,8 @@ DEAL_II_TARGET         - full list of targets with "debug" and "optimized" keywo
 DEAL_II_WITH_64BIT_INDICES
 DEAL_II_WITH_ARPACK
 DEAL_II_WITH_BOOST
-DEAL_II_WITH_FUNCTIONPARSER
+DEAL_II_WITH_BZIP2
+DEAL_II_WITH_CXX11
 DEAL_II_WITH_HDF5
 DEAL_II_WITH_LAPACK
 DEAL_II_WITH_METIS
@@ -797,6 +798,7 @@ DEAL_II_WITH_MPI
 DEAL_II_WITH_MUMPS
 DEAL_II_WITH_MUPARSER
 DEAL_II_WITH_NETCDF
+DEAL_II_WITH_OPENCASCADE
 DEAL_II_WITH_P4EST
 DEAL_II_WITH_PETSC
 DEAL_II_WITH_SLEPC

diff --git a/doc/users/config.sample b/doc/users/config.sample
index 32a5e5c70a7b25d6dca7ca7819543224ead08917..09f749a6fb899757a32b41f7b355ffb388824686 100644 (file)
--- a/doc/users/config.sample
+++ b/doc/users/config.sample
@@ -193,18 +193,16 @@
 
 
 #
-# Functionparser:
+# Muparser:
 #
-# SET(DEAL_II_WITH_FUNCTIONPARSER TRUE CACHE BOOL
-#   "Build deal.II with support for functionparser"
+# SET(DEAL_II_WITH_MUPARSER TRUE CACHE BOOL
+#   "Build deal.II with support for muparser"
 #   )
 #
-# SET(DEAL_II_FORCE_BUNDLED_FUNCTIONPARSER TRUE CACHE BOOL
-#   "Always use the bundled functionparser library instead of an external one."
+# SET(DEAL_II_FORCE_BUNDLED_MUPARSER TRUE CACHE BOOL
+#   "Always use the bundled muparser library instead of an external one."
 #   )
 #
-# Only support for bundled functionparser is available.
-#
 
 
 #
@@ -609,14 +607,12 @@
 #
 # C++11 support:
 #
-# C++11 support is autodetected. You can explicitly disable C+11 support by
-# specifying
-#
-#   SET(DEAL_II_HAVE_CXX11_FLAG FALSE CACHE BOOL "")
+# SET(DEAL_II_WITH_CXX11 ON CACHE BOOL
+#   "deal.II using C++11 language standard"
+#   )
 #
 # A custom C++11 flag can be set by setting
 #
-#   SET(DEAL_II_HAVE_CXX11_FLAG TRUE CACHE BOOL "")
 #   SET(DEAL_II_CXX11_FLAG "-std=c++0x" CACHE STRING "")
 #
 

diff --git a/tests/run_testsuite.cmake b/tests/run_testsuite.cmake
index c665b2133d24c500bf752be5210df7ba16a0e97e..1bc5a9a6ccc8e4678a5c78e41807982830a78be1 100644 (file)
--- a/tests/run_testsuite.cmake
+++ b/tests/run_testsuite.cmake
@@ -268,7 +268,7 @@ GET_CMAKE_PROPERTY(_variables VARIABLES)
 FOREACH(_var ${_variables})
   IF( _var MATCHES "^(TEST|DEAL_II|ALLOW|WITH|FORCE|COMPONENT)_" OR
       _var MATCHES "^(COMPAT_FILES|DOCUMENTATION|EXAMPLES|MESH_CONVERTER|PARAMETER_GUI)" OR
-      _var MATCHES "^(ARPACK|BOOST|FUNCTIONPARSER|HDF5|METIS|MPI|MUMPS)_" OR
+      _var MATCHES "^(ARPACK|BOOST|OPENCASCADE|MUPARSER|HDF5|METIS|MPI|MUMPS)_" OR
       _var MATCHES "^(NETCDF|P4EST|PETSC|SLEPC|THREADS|TBB|TRILINOS)_" OR
       _var MATCHES "^(UMFPACK|ZLIB|LAPACK|MUPARSER)_" OR
       _var MATCHES "^(CMAKE|DEAL_II)_(C|CXX|Fortran|BUILD)_(COMPILER|FLAGS)" OR