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 75b98c915ad702b74dec14f8df444721d9cff7de (commit) via 68c7d3e2ce2fb98980887357dd6308246ea3d64e (commit) from c487ee157c71d261dc54e881d5d504d4b11237b4 (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=75b98c915ad702b74dec14f8df444721d9cff7de commit 75b98c915ad702b74dec14f8df444721d9cff7de Merge: c487ee1 68c7d3e Author: Brad King <brad.k...@kitware.com> Date: Thu Jun 24 11:07:42 2010 -0400 Merge branch 'FindMPI-library-parsing' into next http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68c7d3e2ce2fb98980887357dd6308246ea3d64e commit 68c7d3e2ce2fb98980887357dd6308246ea3d64e Author: Brad King <brad.k...@kitware.com> Date: Thu Jun 24 11:07:19 2010 -0400 FindMPI: Do not parse -l in middle of library name We parse the output of 'mpicc -shome:link' to look for -l options specifying libraries. Fix the parsing regex to avoid matching the string '-l' in the middle of a library name. diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 481b0e9..90e738b 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -263,13 +263,13 @@ elseif (MPI_COMPILE_CMDLINE) # Extract the set of libraries to link against from the link command # line - string(REGEX MATCHALL "-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}") + string(REGEX MATCHALL "(^| )-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}") # Determine full path names for all of the libraries that one needs # to link against in an MPI program set(MPI_LIBRARIES) foreach(LIB ${MPI_LIBNAMES}) - string(REGEX REPLACE "^-l" "" LIB ${LIB}) + string(REGEX REPLACE "^ ?-l" "" LIB ${LIB}) set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE) find_library(MPI_LIB ${LIB} HINTS ${MPI_LINK_PATH}) if (MPI_LIB) ----------------------------------------------------------------------- Summary of changes: Modules/FindMPI.cmake | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits