Avoid suggesting using MPI compiler wrappers as CMake compilers

diff --git a/cmake/configure/configure_1_mpi.cmake b/cmake/configure/configure_1_mpi.cmake
index baba0f60d89ae624253a99a33ee9a2ccc181132d..07f1897fc82de2495d0b8e32a25a96a47f78f11a 100644 (file)
--- a/cmake/configure/configure_1_mpi.cmake
+++ b/cmake/configure/configure_1_mpi.cmake
@@ -65,14 +65,12 @@ MACRO(FEATURE_MPI_ERROR_MESSAGE)
     "Could not find any suitable mpi library!\n"
     ${MPI_ADDITIONAL_ERROR_STRING}
     "\nPlease ensure that an mpi library is installed on your computer\n"
-    "and set CMAKE_CXX_COMPILER to the appropriate mpi wrappers:\n"
-    "    $ CXX=\".../mpicxx\" cmake <...>\n"
-    "    $ cmake -DCMAKE_CXX_COMPILER=\".../mpicxx\" <...>\n"
+    "and set MPI_CXX_COMPILER to the appropriate mpi wrappers:\n"
+    "    $ cmake -DMPI_CXX_COMPILER=\".../mpicxx\" <...>\n"
     "Or with additional C and Fortran wrappers (recommended!):\n"
-    "    $ CC=\".../mpicc\" CXX=\".../mpicxx\" F90=\".../mpif90\" cmake <...>\n"
-    "    $ cmake -DCMAKE_C_COMPILER=\".../mpicc\"\\\n"
-    "            -DCMAKE_CXX_COMPILER=\".../mpicxx\"\\\n"
-    "            -DCMAKE_Fortran_COMPILER=\".../mpif90\"\\\n"
+    "    $ cmake -DMPI_C_COMPILER=\".../mpicc\"\\\n"
+    "            -DMPI_CXX_COMPILER=\".../mpicxx\"\\\n"
+    "            -DMPI_Fortran_COMPILER=\".../mpif90\"\\\n"
     "            <...>\n"
     )
 ENDMACRO()

diff --git a/doc/users/cmake_dealii.html b/doc/users/cmake_dealii.html
index 880b379cabc69bc4c732247e48b3cf6f1ca22664..2841759bbc5917d9f46990aea9f355cb3a97f969 100644 (file)
--- a/doc/users/cmake_dealii.html
+++ b/doc/users/cmake_dealii.html
@@ -814,9 +814,9 @@ cmake -DLAPACK_FOUND=true \
       Compilers can be switched either by command line or by setting
       <code>CMAKE_(C|CXX|Fortran)_COMPILER</code>:
 <pre class="cmake">
-CC=mpicc CXX=mpicxx FC=mpif90 cmake &lt;...&gt;
+CC=my_c_compiler CXX=my_cxx_compiler FC=my_fortran_compiler cmake &lt;...&gt;
 
-cmake -DCMAKE_C_COMPILER="mpicc" -DCMAKE_CXX_COMPILER="mpicxx" -DCMAKE_Fortran_COMPILER="mpif90" &lt;...&gt;
+cmake -DCMAKE_C_COMPILER=my_c_compiler -DCMAKE_CXX_COMPILER=my_cxx_compiler -DCMAKE_Fortran_COMPILER=my_fortran_compiler &lt;...&gt;
 </pre>
       Please note that
       <ul>