From 43634cc4d1f475cc7f2be02122beb11790d379d9 Mon Sep 17 00:00:00 2001 From: maier Date: Wed, 13 Mar 2013 09:51:16 +0000 Subject: [PATCH] CMake: Add forgotten stuff to cmake.html git-svn-id: https://svn.dealii.org/trunk@28877 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/doc/development/Config.sample | 20 ++++++++++++++++++++ deal.II/doc/development/cmake.html | 22 +++++++++++++++++++++- 2 files changed, 41 insertions(+), 1 deletion(-) 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.

+

+ Compilers can be switched either by command line or by setting + CMAKE_(C|CXX)_COMPILER: +
+
+     CC=mpicc CXX=mpicxx cmake <...>
+
+     cmake -DCMAKE_C_COMPILER="mpicc" -DCMAKE_CXX_COMPILER="mpicxx" <...>
+      
+ Please note that + +

+

deal.II will configure sensible default CFLAGS and CXXFLAGS depending on platform, compiler and build @@ -534,7 +554,7 @@