Make building mesh_converter the default.

git-svn-id: https://svn.dealii.org/trunk@29173 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/setup_cached_variables.cmake b/deal.II/cmake/setup_cached_variables.cmake
index 8d38aeab6735eb3dfe2ae904a4d2badd9c1064b3..f5c760bd7d4afc96c81ee1bb143ec2a85f880584 100644 (file)
--- a/deal.II/cmake/setup_cached_variables.cmake
+++ b/deal.II/cmake/setup_cached_variables.cmake
@@ -81,7 +81,7 @@ OPTION(DEAL_II_COMPONENT_EXAMPLES
 
 OPTION(DEAL_II_COMPONENT_MESH_CONVERTER
   "Build and install the mesh_converter. This adds a COMPONENT \"mesh_converter\" to the build system."
-  OFF
+  ON
   )
 
 OPTION(DEAL_II_COMPONENT_PARAMETER_GUI

diff --git a/deal.II/doc/development/Config.sample b/deal.II/doc/development/Config.sample
index 28d2dbf940e9f263c119630a242d552626c24682..528eb299e88b10785a61c942802bee43255c2156 100644 (file)
--- a/deal.II/doc/development/Config.sample
+++ b/deal.II/doc/development/Config.sample
@@ -28,7 +28,7 @@
 #   "Enable configuration and installation of the example steps. This adds a COMPONENT \"examples\" to the build system."
 #   )
 #
-# SET(DEAL_II_COMPONENT_MESH_CONVERTER OFF CACHE BOOL
+# SET(DEAL_II_COMPONENT_MESH_CONVERTER ON CACHE BOOL
 #   "Build and install the mesh_converter. This adds a COMPONENT \"mesh_converter\" to the build system."
 #   )
 #

diff --git a/deal.II/doc/development/cmake.html b/deal.II/doc/development/cmake.html
index be01209bc5e39959b8a847fc89f9ac8c455d2f16..d90449c6a487bc635eaccda754c2ea2af5471d93 100644 (file)
--- a/deal.II/doc/development/cmake.html
+++ b/deal.II/doc/development/cmake.html
@@ -477,7 +477,7 @@
        <li>
           <p>
             <code>DEAL_II_COMPONENT_MESH_CONVERTER</code> (default
-            <code>OFF</code>):
+            <code>ON</code>):
           </p>
           <p>
             Enable configuration and installation of the

diff --git a/deal.II/doc/readme.html b/deal.II/doc/readme.html
index 68c00eb0cbde5efd5db0874ff675f0b342123a6a..56eeadfaa1dac8077834bc0ea7d6e09fbff34a6d 100644 (file)
--- a/deal.II/doc/readme.html
+++ b/deal.II/doc/readme.html
@@ -389,14 +389,18 @@
       <li>
         <p>
           <i>mesh_converter</i>: If you wish to compile and install the
-          mesh_converter, specify
-          <code>-DDEAL_II_COMPONENT_MESH_CONVERTER=ON</code>.
+          <code>mesh_converter</code> tool discussed in the documentation
+         of the <code>GridIn</code> class, specify
+          <code>-DDEAL_II_COMPONENT_MESH_CONVERTER=ON</code>. (This is in fact
+          the default.)
        </p>
+
         <p>
           <i>parameter_gui</i>: If you wish to compile and install the
-          parameter_gui, specify
+          <code>parameter_gui</code> tool discussed in the documentation
+         of the <code>ParameterHandler</code> class, specify
           <code>-DDEAL_II_COMPONENT_PARAMETER_GUI=ON</code>. Beware of the
-          fact that parameterGUI needs development packages for Qt.
+          fact that <code>parameter_gui</code> needs development packages for Qt.
        </p>
     </ul>