This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 954a27c27832fda0e10826159c18ab08a3461346 (commit) via 2f9ad7c6e6067b162d58d8a8628ba2c38106a6e9 (commit) from 10310a62e06c075e713e03187d2d89c4b0e727fd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=954a27c27832fda0e10826159c18ab08a3461346 commit 954a27c27832fda0e10826159c18ab08a3461346 Merge: 10310a6 2f9ad7c Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Tue Mar 20 15:21:25 2012 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Mar 20 15:21:25 2012 -0400 Merge topic 'findmpi_look_in_implicit_dirs' into next 2f9ad7c Fix FindMPI for the intel compiler on linux by looking in implict directories. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f9ad7c6e6067b162d58d8a8628ba2c38106a6e9 commit 2f9ad7c6e6067b162d58d8a8628ba2c38106a6e9 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Tue Mar 20 15:18:53 2012 -0400 Commit: Bill Hoffman <bill.hoff...@kitware.com> CommitDate: Tue Mar 20 15:18:53 2012 -0400 Fix FindMPI for the intel compiler on linux by looking in implict directories. Use the CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES to look for libraries that are in the -showme output from mpi<lang> programs. This is because some libraries reported by -showme are found there, and FindMPI will fail if they are not found. diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 1be4ccf..ae50ca7 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -354,6 +354,20 @@ 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) + set(MPI_LINK_PATH + "${MPI_LINK_PATH};${CMAKE_C_IMPLICIT_LINK_DIRECTORIES}") + endif () # Determine full path names for all of the libraries that one needs # to link against in an MPI program ----------------------------------------------------------------------- Summary of changes: Modules/FindMPI.cmake | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits