[Cmake-commits] CMake branch, master, updated. v3.15.0-rc3-185-g554c2ed

[Kitware Robot]

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, master has been updated
       via  554c2ed743f4134df5552d4702c6b1e1dee97079 (commit)
       via  5affe415a3ca6852c1c43bc439129db56b63649f (commit)
      from  9fad9b56f8b0e8d2714bc867eb0f67facbf5f3c7 (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=554c2ed743f4134df5552d4702c6b1e1dee97079
commit 554c2ed743f4134df5552d4702c6b1e1dee97079
Merge: 9fad9b5 5affe41
Author:     Marc Chevrier <marc.chevrier at gmail.com>
AuthorDate: Tue Jul 2 08:39:06 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Jul 2 04:39:19 2019 -0400

    Merge topic 'FindMPI-AddSuffixes'
    
    5affe415a3 FindMPI: Add MPI_EXECUTABLE_SUFFIX to every item in lists
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3496


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5affe415a3ca6852c1c43bc439129db56b63649f
commit 5affe415a3ca6852c1c43bc439129db56b63649f
Author:     Brian Carlson <bcarlson at paradigm4.com>
AuthorDate: Fri Jun 28 16:11:51 2019 -0400
Commit:     Brian Carlson <bcarlson at paradigm4.com>
CommitDate: Sat Jun 29 13:35:01 2019 -0400

    FindMPI: Add MPI_EXECUTABLE_SUFFIX to every item in lists
    
    Add the `${MPI_EXECUTABLE_SUFFIX}` to each of the items in the
    `_MPI_${id}_${LANG}_COMPILER_NAMES` and `_MPI_${LANG}_GENERIC_COMPILER_NAMES` rather
    than just adding the suffix to the last item in each list.

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index fc9810c..2ff6afe 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -310,11 +310,15 @@ foreach (LANG IN ITEMS C CXX Fortran)
   set(_MPI_${LANG}_COMPILER_NAMES "")
   foreach (id IN ITEMS GNU Intel MSVC PGI XL)
     if (NOT CMAKE_${LANG}_COMPILER_ID OR CMAKE_${LANG}_COMPILER_ID STREQUAL id)
-      list(APPEND _MPI_${LANG}_COMPILER_NAMES ${_MPI_${id}_${LANG}_COMPILER_NAMES}${MPI_EXECUTABLE_SUFFIX})
+      foreach(_COMPILER_NAME IN LISTS _MPI_${id}_${LANG}_COMPILER_NAMES)
+        list(APPEND _MPI_${LANG}_COMPILER_NAMES ${_COMPILER_NAME}${MPI_EXECUTABLE_SUFFIX})
+      endforeach()
     endif()
     unset(_MPI_${id}_${LANG}_COMPILER_NAMES)
   endforeach()
-  list(APPEND _MPI_${LANG}_COMPILER_NAMES ${_MPI_${LANG}_GENERIC_COMPILER_NAMES}${MPI_EXECUTABLE_SUFFIX})
+  foreach(_COMPILER_NAME IN LISTS _MPI_${LANG}_GENERIC_COMPILER_NAMES)
+    list(APPEND _MPI_${LANG}_COMPILER_NAMES ${_COMPILER_NAME}${MPI_EXECUTABLE_SUFFIX})
+  endforeach()
   unset(_MPI_${LANG}_GENERIC_COMPILER_NAMES)
 endforeach()
 

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

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


hooks/post-receive
-- 
CMake