From: maier Date: Tue, 6 Nov 2012 13:42:16 +0000 (+0000) Subject: Some more polishing X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=faa3bfacb762587a96ef45d07f70765fbca1254b;p=dealii-svn.git Some more polishing git-svn-id: https://svn.dealii.org/branches/branch_cmake@27429 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/doc/cmake.html b/deal.II/doc/cmake.html index 749c315f44..eaa000baf9 100644 --- a/deal.II/doc/cmake.html +++ b/deal.II/doc/cmake.html @@ -66,18 +66,17 @@ When configuring deal.II by running cmake, the cmake program creates a cache in the current (build) directory that contains - the values of all cached variables that had previously been passed + the values of all (cached) variables that had previously been passed as command line arguments, been found through running tests, or had otherwise been set.

- Normally, one will then simply build the library in this - directory by calling make and install it. If the - library changes, one would just call make again and - it would only re-compile those files that depend on those sources - that have changed. In other words, one will rarely have to deal - with the cached variables at all. + Normally, after running cmake one will simply build + the library by calling make. If the library changes, + a subsequent call to make will only re-compile those + files that depend on sources that have changed. In other words, + one will rarely have to deal with the cached variables at all.

@@ -89,10 +88,9 @@ calling make calls back and runs cmake again automatically.) Either way, if that happens, then cmake will only run whatever tests are really - necessary; values for variables that are already in the cache - are not re-evaluated. This means that calling cmake - a second time without any arguments at all in a situation like - this + necessary; values for variables that are already in the cache + are not re-evaluated. This means that calling cmake + a second time without any arguments at all in a situation like this

 
     mkdir build
@@ -103,7 +101,7 @@
       has absolutely no effect: In particular, the second time around
       it uses the CMAKE_INSTALL_PREFIX value previously
       passed, along with all other arguments one may have had on the
-      first invokation. This is different from the way
+      first invocation. This is different from the way
       the autoconf/configure mechanism worked.
     

@@ -139,13 +137,14 @@ cmake -DDEAL_II_WITH_METIS=OFF ../
switches off support for the METIS library that may have been - automatically detected the first time around but that we really - didn't want to link with. + automatically detected during the first invocation of + cmake but that we really didn't want to link with.

Compiling only certain parts

+

Just like with simple make, cmake @@ -154,7 +153,8 @@ are. The most common scenario is that you only want to build debug or optimized libraries. This can be achieved using the following commands in the build directory: - TODO: This is a bit misleading, as make install won't succeed + TODO: This is a bit misleading, as make install + always implies make all.

 
     make  deal_II.g     # only debug library
@@ -444,6 +444,25 @@
     
     

Build configuration

+

+ CMAKE_BUILD_TYPE controls the type of build. + We support the Debug, Release + and DebugRelease build targets. Default is the + DebugRelease target. +

+ For more information, see the general discussion + here. +

+

deal.II will configure sensible default CFLAGS and CXXFLAGS depending on platform, compiler and build