Merge branch 'master' of https://framagit.org/simgrid/simgrid

[simgrid.git] / docs / source / app_smpi.rst

diff --git a/docs/source/app_smpi.rst b/docs/source/app_smpi.rst
index 7e43c5d4af5def31d820b0eb2551d65d1dcb40dc..ddea04e9ef53948a8b298e1e993c35f97d33a128 100644 (file)
--- a/docs/source/app_smpi.rst
+++ b/docs/source/app_smpi.rst
@@ -106,7 +106,7 @@ tracing during the simulation. You can get the full list by running
 
 Finally, you can pass :ref:`any valid SimGrid parameter <options>` to your
 program. In particular, you can pass ``--cfg=network/model:ns-3`` to
 
 Finally, you can pass :ref:`any valid SimGrid parameter <options>` to your
 program. In particular, you can pass ``--cfg=network/model:ns-3`` to

-switch to use :ref:`model_ns3`. These parameters should be placed after
+switch to use :ref:`models_ns3`. These parameters should be placed after

 the name of your binary on the command line.
 
 ...............................
 the name of your binary on the command line.
 
 ...............................


@@ -749,11 +749,11 @@ them on top of SMPI.
 Troubleshooting with SMPI
 -------------------------
 
 Troubleshooting with SMPI
 -------------------------
 

-.................................
-./configure refuses to use smpicc
-.................................
+.........................................
+./configure or cmake refuse to use smpicc
+.........................................

 
 

-If your ``./configure`` reports that the compiler is not
+If your configuration script (such as ``./configure`` or ``cmake``) reports that the compiler is not

 functional or that you are cross-compiling, try to define the
 ``SMPI_PRETEND_CC`` environment variable before running the
 configuration.
 functional or that you are cross-compiling, try to define the
 ``SMPI_PRETEND_CC`` environment variable before running the
 configuration.


@@ -772,20 +772,20 @@ fail without ``smpirun``.
 
 .. warning::
 
 
 .. warning::
 

-  Make sure that SMPI_PRETEND_CC is only set when calling ./configure,
+  Make sure that SMPI_PRETEND_CC is only set when calling the configuration script but

   not during the actual execution, or any program compiled with smpicc
   will stop before starting.
 
   not during the actual execution, or any program compiled with smpicc
   will stop before starting.
 

-..............................................
-./configure does not pick smpicc as a compiler
-..............................................
+.....................................................
+./configure or cmake do not pick smpicc as a compiler
+.....................................................

 
 In addition to the previous answers, some projects also need to be
 explicitly told what compiler to use, as follows:
 
 .. code-block:: console
 
 
 In addition to the previous answers, some projects also need to be
 explicitly told what compiler to use, as follows:
 
 .. code-block:: console
 

-   $ SMPI_PRETEND_CC=1 ./configure CC=smpicc # here come the other configure parameters
+   $ SMPI_PRETEND_CC=1 cmake CC=smpicc # here come the other configure parameters

    $ make
 
 Maybe your configure is using another variable, such as ``cc`` (in
    $ make
 
 Maybe your configure is using another variable, such as ``cc`` (in