Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/cmake/files: cmake-2.8.1-mpi.patch
Date: Thu, 27 May 2010 09:27:59
Message-Id: 20100527092753.553FB2CE3C@corvid.gentoo.org
1 jlec 10/05/27 09:27:53
2
3 Added: cmake-2.8.1-mpi.patch
4 Log:
5 Fix problem with detecting mpi libs through FindMPI module, commited on permission of scarabeus
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 dev-util/cmake/files/cmake-2.8.1-mpi.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.1-mpi.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-2.8.1-mpi.patch?rev=1.1&content-type=text/plain
13
14 Index: cmake-2.8.1-mpi.patch
15 ===================================================================
16 diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
17 index 481b0e9..43e97e8 100644
18 --- a/Modules/FindMPI.cmake
19 +++ b/Modules/FindMPI.cmake
20 @@ -263,13 +263,13 @@ elseif (MPI_COMPILE_CMDLINE)
21
22 # Extract the set of libraries to link against from the link command
23 # line
24 - string(REGEX MATCHALL "-l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}")
25 + string(REGEX MATCHALL " -l([^\" ]+|\"[^\"]+\")" MPI_LIBNAMES "${MPI_LINK_CMDLINE}")
26
27 # Determine full path names for all of the libraries that one needs
28 # to link against in an MPI program
29 set(MPI_LIBRARIES)
30 foreach(LIB ${MPI_LIBNAMES})
31 - string(REGEX REPLACE "^-l" "" LIB ${LIB})
32 + string(REGEX REPLACE "^ -l" "" LIB ${LIB})
33 set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
34 find_library(MPI_LIB ${LIB} HINTS ${MPI_LINK_PATH})
35 if (MPI_LIB)