[Cmake-commits] CMake branch, next, updated. v3.7.2-2538-g5d57061

[Brad King]

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  5d570616a4f3675260490da1604b8ad17ce98bbe (commit)
       via  a2a73935b22444b158ec5de2916deb02d9f7928b (commit)
       via  93f29be2316f51f1d27fb543f92911be5b9cec9e (commit)
      from  f28a0de44953afab170272a04dca84432c4e0768 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d570616a4f3675260490da1604b8ad17ce98bbe
commit 5d570616a4f3675260490da1604b8ad17ce98bbe
Merge: f28a0de a2a7393
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 3 13:18:02 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 3 13:18:02 2017 -0500

    Merge topic 'findmpi-flags-fix' into next
    
    a2a73935 FindMPI: Remove leading spaces from flags
    93f29be2 FindMPI: Reset MPI_INCLUDE_PATH_WORK before use


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2a73935b22444b158ec5de2916deb02d9f7928b
commit a2a73935b22444b158ec5de2916deb02d9f7928b
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Thu Feb 2 11:31:22 2017 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Thu Feb 2 11:31:22 2017 +0100

    FindMPI: Remove leading spaces from flags

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 9cc7cab..dd700e3 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -313,6 +313,7 @@ function (interrogate_mpi_compiler lang try_libs)
         set(MPI_COMPILE_FLAGS_WORK)
 
         foreach(FLAG ${MPI_ALL_COMPILE_FLAGS})
+          string(REGEX REPLACE "^ " "" FLAG ${FLAG})
           if (MPI_COMPILE_FLAGS_WORK)
             string(APPEND MPI_COMPILE_FLAGS_WORK " ${FLAG}")
           else()
@@ -364,6 +365,7 @@ function (interrogate_mpi_compiler lang try_libs)
         string(REGEX MATCHALL "(^| )(-Wl,|-Xlinker )([^\" ]+|\"[^\"]+\")" MPI_ALL_LINK_FLAGS "${MPI_LINK_CMDLINE}")
         set(MPI_LINK_FLAGS_WORK)
         foreach(FLAG ${MPI_ALL_LINK_FLAGS})
+          string(REGEX REPLACE "^ " "" FLAG ${FLAG})
           if (MPI_LINK_FLAGS_WORK)
             string(APPEND MPI_LINK_FLAGS_WORK " ${FLAG}")
           else()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93f29be2316f51f1d27fb543f92911be5b9cec9e
commit 93f29be2316f51f1d27fb543f92911be5b9cec9e
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Wed Feb 1 18:45:13 2017 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Wed Feb 1 18:45:13 2017 +0100

    FindMPI: Reset MPI_INCLUDE_PATH_WORK before use

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 842acef..9cc7cab 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -322,6 +322,8 @@ function (interrogate_mpi_compiler lang try_libs)
 
         # Extract include paths from compile command line
         string(REGEX MATCHALL "(^| )-I([^\" ]+|\"[^\"]+\")" MPI_ALL_INCLUDE_PATHS "${MPI_COMPILE_CMDLINE}")
+        set(MPI_INCLUDE_PATH_WORK)
+
         foreach(IPATH ${MPI_ALL_INCLUDE_PATHS})
           string(REGEX REPLACE "^ ?-I" "" IPATH ${IPATH})
           string(REPLACE "//" "/" IPATH ${IPATH})

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindMPI.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake