From e31bfad271d5dde47f4bdd5c36212b3154754199 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Mon, 12 Jul 2021 14:08:24 -0400 Subject: [PATCH] Avoid suggesting using MPI compiler wrappers as CMake compilers --- cmake/configure/configure_1_mpi.cmake | 12 +++++------- doc/users/cmake_dealii.html | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/cmake/configure/configure_1_mpi.cmake b/cmake/configure/configure_1_mpi.cmake index baba0f60d8..07f1897fc8 100644 --- 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 880b379cab..2841759bbc 100644 --- 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 CMAKE_(C|CXX|Fortran)_COMPILER: 
-CC=mpicc CXX=mpicxx FC=mpif90 cmake <...>
+CC=my_c_compiler CXX=my_cxx_compiler FC=my_fortran_compiler cmake <...>
 
-cmake -DCMAKE_C_COMPILER="mpicc" -DCMAKE_CXX_COMPILER="mpicxx" -DCMAKE_Fortran_COMPILER="mpif90" <...>
+cmake -DCMAKE_C_COMPILER=my_c_compiler -DCMAKE_CXX_COMPILER=my_cxx_compiler -DCMAKE_Fortran_COMPILER=my_fortran_compiler <...>
Please note that