Update documentation with C++14 information.

diff --git a/doc/doxygen/headers/laoperators.h b/doc/doxygen/headers/laoperators.h
index 67ba1ae86778ec5ab98adf9084ca132cf08258c3..00db2735b923caa409f7691df127c43ba948aeb3 100644 (file)
--- a/doc/doxygen/headers/laoperators.h
+++ b/doc/doxygen/headers/laoperators.h
@@ -21,8 +21,9 @@
  * <h3>Linear Operator</h3>
  *
  * If deal.II is configured with C++11 support (i.e.,
- * <code>DEAL_II_WITH_CXX11=on</code> during configuration) a versatile
- * mechanism for storing the concept of a linear operator is available.
+ * <code>DEAL_II_WITH_CXX11=ON</code> or <code>DEAL_II_WITH_CXX14=ON</code>
+ * during configuration) a versatile mechanism for storing the concept of a
+ * linear operator is available.
  *
  * This is done with a LinearOperator class that, similarly to the abstract
  * MATRIX interface, defines a minimal interface for <i>applying</i> a

diff --git a/doc/doxygen/options.dox.in b/doc/doxygen/options.dox.in
index ba60985bbf0653a04ca4f56ffe7d730dfcf7163f..8375cf2b9b2d8bbcc8f094d0afab5796f9a10fce 100644 (file)
--- a/doc/doxygen/options.dox.in
+++ b/doc/doxygen/options.dox.in
@@ -159,6 +159,7 @@ PREDEFINED             = DOXYGEN=1 \
                          DEAL_II_WITH_ARPACK=1 \
                          DEAL_II_WITH_BOOST=1 \
                          DEAL_II_WITH_CXX11=1 \
+                         DEAL_II_WITH_CXX14=1 \
                          DEAL_II_WITH_HDF5=1 \
                          DEAL_II_WITH_LAPACK=1 \
                          DEAL_II_WITH_METIS=1 \

diff --git a/doc/news/changes.h b/doc/news/changes.h
index 4a17b396d999ec473ff2d2aa5c069637ef1e6473..07c0d0191f78e7c769fb358db9c91e9c292be310 100644 (file)
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -385,6 +385,12 @@ inconvenience this causes.
 
 
 <ol>
+  <li> New: deal.II now supports compilation in C++14 mode, which may be
+  enabled with the CMake option <code>DEAL_II_WITH_CXX14</code>.
+  <br>
+  (David Wells, 2015/06/21)
+  </li>
+
   <li> New: Implement a modified version of the Kelly error estimator, which
   effectively provides the boundary residual term for the hp-FEM error estimators.
   <br>

diff --git a/doc/users/cmake.html b/doc/users/cmake.html
index 8250ee22b60f85b7318a35978f8063cd39c11c9f..40363835a0ad07a6b07cffc8567f2a93dd6ab127 100644 (file)
--- a/doc/users/cmake.html
+++ b/doc/users/cmake.html
@@ -426,13 +426,24 @@ parameter_gui  - builds and installs the 'parameter_gui' component
     <h3>Feature configuration</h3>
 
     <p>
-      <acronym>deal.II</acronym> provides (optional) interfaces to quite
-      a number of external libraries. All of these are represented by
-      <code>cmake</code> variables that are set to <code>ON</code> if
-      an external package is found or to <code>OFF</code> otherwise. By
-      explicitly setting it to off either on the command line or using
-      <code>ccmake</code>, you can prevent <acronym>deal.II</acronym>
-      from using this external package, even if it is found.
+      <acronym>deal.II</acronym> provides (optional) interfaces to quite a
+      number of external libraries as well as multiple versions
+      of <code>C++</code>. All of these options are represented
+      by <code>cmake</code> variables that may be set to either <code>ON</code>
+      or <code>OFF</code>.
+
+      By default, <acronym>deal.II</acronym> does not provide the compiler with
+      any <code>C++</code> version flag. If
+      either <code>DEAL_II_WITH_CXX11</code> or <code>DEAL_II_WITH_CXX14</code>
+      is set to <code>ON</code>, then <code>cmake</code> will attempt to
+      determine both the level of compliance and the correct compiler flag for
+      the requested language standard.
+
+      The remaining flags are set to <code>ON</code> if an external package is
+      found or to <code>OFF</code> otherwise. By explicitly setting it to off
+      either on the command line or using <code>ccmake</code>, you can
+      prevent <acronym>deal.II</acronym> from using an external package, even if
+      it is found.
     </p>
 
     <p>
@@ -444,6 +455,7 @@ DEAL_II_WITH_ARPACK
 DEAL_II_WITH_BOOST
 DEAL_II_WITH_BZIP2
 DEAL_II_WITH_CXX11
+DEAL_II_WITH_CXX14
 DEAL_II_WITH_HDF5
 DEAL_II_WITH_LAPACK
 DEAL_II_WITH_METIS
@@ -477,6 +489,15 @@ DEAL_II_WITH_ZLIB
       libraries.
     </p>
 
+    <p>
+      Additionally, the variable
+<pre class="cmake">
+DEAL_II_CXX_VERSION_FLAG
+</pre>
+      may be set to specify the <code>C++</code> language version flag passed to
+      the compiler.
+    </p>
+
     <p>
       There are some options to determine the behavior of the dependency
       resolution.

diff --git a/doc/users/cmakelists.html b/doc/users/cmakelists.html
index a3e204cdb11ee01f0ed04594142ebd74c7b97206..a03ac2187ae66ea3f9de5b0476a8e9e97261e633 100644 (file)
--- a/doc/users/cmakelists.html
+++ b/doc/users/cmakelists.html
@@ -848,6 +848,7 @@ DEAL_II_WITH_ARPACK
 DEAL_II_WITH_BOOST
 DEAL_II_WITH_BZIP2
 DEAL_II_WITH_CXX11
+DEAL_II_WITH_CXX14
 DEAL_II_WITH_HDF5
 DEAL_II_WITH_LAPACK
 DEAL_II_WITH_METIS

diff --git a/doc/users/config.sample b/doc/users/config.sample
index d45cac19f0538b6e59c0d99f0eb0003a9a0b2a9f..b761fa5ce22c79453c9cffd1856db6c2b1530af0 100644 (file)
--- a/doc/users/config.sample
+++ b/doc/users/config.sample
@@ -583,7 +583,19 @@
 #
 # A custom C++11 flag can be set by setting
 #
-#   SET(DEAL_II_CXX11_FLAG "-std=c++0x" CACHE STRING "")
+#   SET(DEAL_II_CXX_VERSION_FLAG "-std=c++0x" CACHE STRING "")
+#
+
+#
+# C++14 support:
+#
+# SET(DEAL_II_WITH_CXX14 ON CACHE BOOL
+#   "deal.II using C++14 language standard"
+#   )
+#
+# A custom C++14 flag can be set by setting
+#
+#   SET(DEAL_II_CXX_VERSION_FLAG "-std=c++1y" CACHE STRING "")
 #