[Cmake-commits] CMake branch, next, updated. v3.7.2-2309-g8ccf48b

[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  8ccf48b37ada48d940e7a525cab2354ded7f3794 (commit)
       via  e6eaf25c3a74c6d075178e309cb0eea8d894698a (commit)
       via  39bf93c897626130177d57e6813cbe46b35c4972 (commit)
      from  90a3dd6f7cbb1263ea92537fc780678aa6c01999 (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=8ccf48b37ada48d940e7a525cab2354ded7f3794
commit 8ccf48b37ada48d940e7a525cab2354ded7f3794
Merge: 90a3dd6 e6eaf25
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 24 15:42:08 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 24 15:42:08 2017 -0500

    Merge topic 'intel-mpi-windows-fix' into next
    
    e6eaf25c FindMPI: Strip quotes from include path and convert to CMake path format
    39bf93c8 FindMPI: Add Intel MPI wrapper names on Windows


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6eaf25c3a74c6d075178e309cb0eea8d894698a
commit e6eaf25c3a74c6d075178e309cb0eea8d894698a
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Mon Jan 23 17:21:47 2017 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Mon Jan 23 17:30:45 2017 +0100

    FindMPI: Strip quotes from include path and convert to CMake path format

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 4613ec4..e91a6a9 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -326,6 +326,8 @@ function (interrogate_mpi_compiler lang try_libs)
         foreach(IPATH ${MPI_ALL_INCLUDE_PATHS})
           string(REGEX REPLACE "^ ?-I" "" IPATH ${IPATH})
           string(REPLACE "//" "/" IPATH ${IPATH})
+          string(REPLACE "\"" "" IPATH ${IPATH})
+          file(TO_CMAKE_PATH "${IPATH}" IPATH)
           list(APPEND MPI_INCLUDE_PATH_WORK ${IPATH})
         endforeach()
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=39bf93c897626130177d57e6813cbe46b35c4972
commit 39bf93c897626130177d57e6813cbe46b35c4972
Author:     Christian Pfeiffer <cpfeiffer at live.de>
AuthorDate: Mon Jan 23 17:19:49 2017 +0100
Commit:     Christian Pfeiffer <cpfeiffer at live.de>
CommitDate: Mon Jan 23 17:30:25 2017 +0100

    FindMPI: Add Intel MPI wrapper names on Windows

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 842acef..4613ec4 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -113,9 +113,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 #
 
 # Start out with the generic MPI compiler names, as these are most commonly used.
-set(_MPI_C_COMPILER_NAMES                  mpicc    mpcc      mpicc_r mpcc_r)
+set(_MPI_C_COMPILER_NAMES                  mpicc    mpcc      mpicc_r mpcc_r  mpicc.bat)
 set(_MPI_CXX_COMPILER_NAMES                mpicxx   mpiCC     mpcxx   mpCC    mpic++   mpc++
-                                           mpicxx_r mpiCC_r   mpcxx_r mpCC_r  mpic++_r mpc++_r)
+                                           mpicxx_r mpiCC_r   mpcxx_r mpCC_r  mpic++_r mpc++_r
+                                           mpicxx.bat)
 set(_MPI_Fortran_COMPILER_NAMES            mpif95   mpif95_r  mpf95   mpf95_r
                                            mpif90   mpif90_r  mpf90   mpf90_r
                                            mpif77   mpif77_r  mpf77   mpf77_r)
@@ -127,9 +128,9 @@ set(_MPI_GNU_Fortran_COMPILER_NAMES        mpigfortran mpgfortran mpigfortran_r
                                            mpig77 mpig77_r mpg77 mpg77_r)
 
 # Intel MPI compiler names
-set(_MPI_Intel_C_COMPILER_NAMES            mpiicc)
-set(_MPI_Intel_CXX_COMPILER_NAMES          mpiicpc  mpiicxx mpiic++ mpiiCC)
-set(_MPI_Intel_Fortran_COMPILER_NAMES      mpiifort mpiif95 mpiif90 mpiif77)
+set(_MPI_Intel_C_COMPILER_NAMES            mpiicc   mpiicc.bat)
+set(_MPI_Intel_CXX_COMPILER_NAMES          mpiicpc  mpiicxx mpiic++ mpiiCC  mpiicpc.bat)
+set(_MPI_Intel_Fortran_COMPILER_NAMES      mpiifort mpiif95 mpiif90 mpiif77 mpiifort.bat)
 
 # PGI compiler names
 set(_MPI_PGI_C_COMPILER_NAMES              mpipgcc mppgcc)

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

Summary of changes:
 Modules/FindMPI.cmake |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake