summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-12-15 16:06:42 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-12-15 16:06:42 (GMT)
commit4d2c6290453e00f0b1060788cf52a5a01963b864 (patch)
tree85f42dc5838635c170ea3b087c57e077e69aced8 /Modules
parentbbabb9d810b52df303980a2271ad538637c077d5 (diff)
parenta0792c48513fd76d8eb00a52f551f0f6fe1b71dc (diff)
downloadCMake-4d2c6290453e00f0b1060788cf52a5a01963b864.zip
CMake-4d2c6290453e00f0b1060788cf52a5a01963b864.tar.gz
CMake-4d2c6290453e00f0b1060788cf52a5a01963b864.tar.bz2
Merge topic 'FindMPI-parse-Xlinker-flags'
a0792c48 FindMPI: Extract -Xlinker options
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindMPI.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 0508579..8e39a7f 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -364,7 +364,7 @@ function (interrogate_mpi_compiler lang try_libs)
endif()
# Extract linker flags from the link command line
- string(REGEX MATCHALL "(^| )-Wl,([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_FLAGS "${MPI_LINK_CMDLINE}")
+ string(REGEX MATCHALL "(^| )(-Wl,|-Xlinker )([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_FLAGS "${MPI_LINK_CMDLINE}")
set(MPI_LINK_FLAGS_WORK)
foreach(FLAG ${MPI_ALL_LINK_FLAGS})
if (MPI_LINK_FLAGS_WORK)