From 664267f4623af81c98b1070cab991b981608ed54 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 29 Dec 2014 13:05:50 +0100 Subject: [PATCH] Update documentation of DEAL_II_WITH_* lists, and testsuite configuration --- cmake/config/CMakeLists.txt | 4 ++-- doc/users/cmake.html | 11 +++++++---- doc/users/cmakelists.html | 4 +++- doc/users/config.sample | 20 ++++++++------------ tests/run_testsuite.cmake | 2 +- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/cmake/config/CMakeLists.txt b/cmake/config/CMakeLists.txt index dce4498ca0..6e16425db1 100644 --- 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 75a2e9b59a..bf3a538b73 100644 --- 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): 
+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
They all have standard meaning with the exception of two: @@ -497,7 +500,7 @@ DEAL_II_WITH_64BIT_INDICES

  • - DEAL_II_FORCE_BUNDLED_(BOOST|FUNCTIONPARSER|THREADS|UMFPACK): + DEAL_II_FORCE_BUNDLED_(BOOST|MUPARSER|THREADS|UMFPACK):

    Forces the use of the bundled library regardless whether diff --git a/doc/users/cmakelists.html b/doc/users/cmakelists.html index 9423d46296..a0bfb3f17b 100644 --- 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 32a5e5c70a..09f749a6fb 100644 --- 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 c665b2133d..1bc5a9a6cc 100644 --- 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 -- 2.39.5