diff options
| author | Melven Roehrig-Zoellner <Melven.Roehrig-Zoellner@DLR.de> | 2014-04-09 20:22:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-11 13:59:48 (GMT) |
| commit | 856bfe238c8efa7f9cd4e07b883f1571e7d01277 (patch) | |
| tree | 30e800e103f3695e2750a7481a1dec19cada7e88 /Modules/FindMPI.cmake | |
| parent | 3927747547a5ddc9495cc4796876e207f2cae811 (diff) | |
| download | CMake-856bfe238c8efa7f9cd4e07b883f1571e7d01277.zip CMake-856bfe238c8efa7f9cd4e07b883f1571e7d01277.tar.gz CMake-856bfe238c8efa7f9cd4e07b883f1571e7d01277.tar.bz2 | |
FindMPI: Use compiler implicit link dirs for matching language (#14870)
Update the logic added by commit 2f9ad7c6 (Fix FindMPI for the intel
compiler on linux, 2012-03-20) to use the implicit link directories for
the current ${lang} instead of hard-coding C or CXX which may not be
enabled. This is necessary for Fortran-only projects.
Diffstat (limited to 'Modules/FindMPI.cmake')
| -rw-r--r-- | Modules/FindMPI.cmake | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index c8d46ba..aa2dcee 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -378,19 +378,14 @@ function (interrogate_mpi_compiler lang try_libs) # Extract the set of libraries to link against from the link command # line string(REGEX MATCHALL "(^| )-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}") + # add the compiler implicit directories because some compilers # such as the intel compiler have libraries that show up # in the showme list that can only be found in the implicit - # link directories of the compiler. Do this for C++ and C - # compilers if the implicit link directories are defined. - if (DEFINED CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES) - set(MPI_LINK_PATH - "${MPI_LINK_PATH};${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}") - endif () - - if (DEFINED CMAKE_C_IMPLICIT_LINK_DIRECTORIES) + # link directories of the compiler. + if (DEFINED CMAKE_${lang}_IMPLICIT_LINK_DIRECTORIES) set(MPI_LINK_PATH - "${MPI_LINK_PATH};${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}") + "${MPI_LINK_PATH};${CMAKE_${lang}_IMPLICIT_LINK_DIRECTORIES}") endif () # Determine full path names for all of the libraries that one needs |