From: maier <maier@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Wed, 13 Mar 2013 09:51:16 +0000 (+0000)
Subject: CMake: Add forgotten stuff to cmake.html
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43634cc4d1f475cc7f2be02122beb11790d379d9;p=dealii-svn.git

CMake: Add forgotten stuff to cmake.html

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

diff --git a/deal.II/doc/development/Config.sample b/deal.II/doc/development/Config.sample
index be0de502ec..f1788fe7fc 100644
--- a/deal.II/doc/development/Config.sample
+++ b/deal.II/doc/development/Config.sample
@@ -436,6 +436,26 @@
 #
 
 
+#
+# ZLIB:
+#
+# SET(DEAL_II_WITH_ZLIB ON CACHE BOOL
+#   "Build deal.II with support for zlib"
+#   )
+#
+# Automatic detection:
+#
+# Specify a hint with CMAKE_PREFIX_PATH or by setting
+# SET(ZLIB_ROOT "/.../..." CACHE PATH "")
+#
+# Manual setup:
+#
+# SET(ZLIB_FOUND TRUE CACHE BOOL "")
+# SET(ZLIB_LIBRARIES "library;and;semicolon;separated;list;of;link;interface" CACHE STRING "")
+# SET(ZLIB_INCLUDE_DIRS "semicolon;separated;list;of;include;dirs" CACHE STRING "")
+#
+
+
 
 ###########################################################################
 #                                                                         #
diff --git a/deal.II/doc/development/cmake.html b/deal.II/doc/development/cmake.html
index f110dded55..900399389d 100644
--- a/deal.II/doc/development/cmake.html
+++ b/deal.II/doc/development/cmake.html
@@ -495,6 +495,26 @@
         href="../readme.html#configuration">here</a>.
     </p>
 
+    </p>
+      Compilers can be switched either by command line or by setting
+      <code>CMAKE_(C|CXX)_COMPILER</code>:
+      <pre>
+
+     CC=mpicc CXX=mpicxx cmake &lt;...&gt;
+
+     cmake -DCMAKE_C_COMPILER="mpicc" -DCMAKE_CXX_COMPILER="mpicxx" &lt;...&gt;
+      </pre>
+      Please note that
+      <ul>
+        <li>
+          The compiler <i>must</i> be specified at the very first
+          invokation of <code>cmake</code>.
+        <li>
+          The specified C and CXX compilers must be the same compiler
+          brand and the same compiler version.
+      </ul>
+    </p>
+
     <p>
       deal.II will configure sensible default <code>CFLAGS</code> and
       <code>CXXFLAGS</code> depending on platform, compiler and build
@@ -534,7 +554,7 @@
       <ul>
         <li>
           <code>DEAL_II_ALLOW_PLATFORM_INTROSPECTION</code>: If set
-          (default), <acronym>deal.II</acronym> will do platform
+          (default), <acronym>deal.II</acronym> will perform platform
           introspection for the given CPU.
 
 	<li>