From 65859ea65ed8399e24208116e83efa30e6333ceb Mon Sep 17 00:00:00 2001 From: maier Date: Sat, 3 Nov 2012 19:12:11 +0000 Subject: [PATCH] Some typos and old stuff removed git-svn-id: https://svn.dealii.org/branches/branch_cmake@27341 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/cmake.html | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/deal.II/doc/cmake.html b/deal.II/doc/cmake.html index 51c9177007..5787348772 100644 --- a/deal.II/doc/cmake.html +++ b/deal.II/doc/cmake.html @@ -24,6 +24,9 @@ with cmake and building with it.

+

+ TODO: Table of Contents +

Operating the configuration system

@@ -244,7 +247,7 @@

Autoconfiguration

- As long as DEAL_II_WITH_<FEATURE> is not set explicitly to ON or OFF in the cache it + As long as DEAL_II_WITH_<FEATURE> is not explicitly set to ON or OFF in the cache it will be automatically configured. If a toggle DEAL_II_WITH_<FEATURE> is defined it won't be altered. This means that the very first configuration run will set all @@ -307,11 +310,12 @@

Currently, the following variables will be considered:

-
+              HDF5_DIR
               METIS_DIR,
               MUMPS_DIR (and SCALAPACK_DIR, BLACS_DIR),
               P4EST_DIR (and SC_DIR),
               PETSC_DIR and PETSC_ARCH (forming ${PETSC_DIR}/${PETSC_ARCH}),
+              SLEPC_DIR and SLEPC_ARCH (forming ${SLEPC_DIR}/${SLEPC_ARCH}),
               TRILINOS_DIR,
               UMFPACK_DIR (and AMD_DIR, SUITESPARSECONFIG_DIR)
 	    
@@ -482,8 +486,7 @@

Finding the deal.II library

- If DEAL_II_COMPONENT_PROJECT_CONFIG was set, finding the deal.II library - should be no more than + Finding the deal.II library should be no more than

 
 	FIND_PACKAGE(deal.II CONFIG REQUIRED)
@@ -549,7 +552,8 @@
 
     

Usually for actually using deal.II the following configuration steps are - necessary. This can be either done by hand (a), or set up via macros (b). + necessary. This can be either done by hand (1.), or set up via macros + (2.).

  1. Configuration by hand:
      @@ -651,7 +655,7 @@
  2. Configuration with the help of two convencience macros: - All the steps explained in the first option above can be automatically dpme with the help + All the steps explained in the first option above can be automatically done with the help of two convenience macros. This boils down to the following example code:
    @@ -667,7 +671,7 @@
     	  
    -
  3. It is also possible to include deal.II as external target directly +
  4. It is also possible to include deal.II as an external target directly into a cmake project:
     
    -- 
    2.39.5