Merge branch 'smpi-topo'

[simgrid.git] / doc / doxygen / install.doc

diff --git a/doc/doxygen/install.doc b/doc/doxygen/install.doc
index 8867f4c..b557898 100644 (file)
--- a/doc/doxygen/install.doc
+++ b/doc/doxygen/install.doc
@@ -130,7 +130,7 @@ Note that compile-time options are very different from @ref options
 
 The default configuration should be ok for most usages, but if you
 need to change something, there is several ways to do so. First, you
 
 The default configuration should be ok for most usages, but if you
 need to change something, there is several ways to do so. First, you

-can use environment variable. For example, you can change the used
+can use environment variables. For example, you can change the used

 compilers by issuing these commands before launching cmake:
 
 @verbatim
 compilers by issuing these commands before launching cmake:
 
 @verbatim


@@ -138,6 +138,9 @@ export CC=gcc-4.4
 export CXX=g++-4.4
 @endverbatim
 
 export CXX=g++-4.4
 @endverbatim
 

+Note that other variables are available, such as CFLAGS and CXXFLAGS to add
+options for respectively the C compiler and the C++ compiler.
+

 Another way to do so is to use the -D argument of cmake as follows.
 Note that the terminating dot is mandatory (see @ref
 install_cmake_outsrc to understand its meaning).
 Another way to do so is to use the -D argument of cmake as follows.
 Note that the terminating dot is mandatory (see @ref
 install_cmake_outsrc to understand its meaning).


@@ -188,13 +191,6 @@ accepts several options, as listed below.
       your simulation speed even if you simulate without activating
       the model-checker. We are working on improving this situation.
 
       your simulation speed even if you simulate without activating
       the model-checker. We are working on improving this situation.
 

-  @li <b>enable_supernovae</b> (ON/OFF): If you use an ancient
-      compiler (such as gcc prior to 4.6), you want to enable this
-      option to ensure that the whole SimGrid library is presented to
-      the compiler as a unique compilation unit to allow cross-units
-      optimizations. This is useless on modern compilers (and will
-      soon be droped).
-

   @li <b>enable_compile_warnings</b> (ON/OFF): request the compiler to
       issue error message whenever the source code is not perfectly
       clean. If you develop SimGrid itself, you must activate it to
   @li <b>enable_compile_warnings</b> (ON/OFF): request the compiler to
       issue error message whenever the source code is not perfectly
       clean. If you develop SimGrid itself, you must activate it to