[Cmake-commits] CMake branch, master, updated. v3.15.0-464-gf54c9f6

[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  f54c9f6cc39e805dfd62aae255c4870da312de19 (commit)
       via  cf04da7e702014c7cc163dd4a78bccdeff813210 (commit)
      from  7feece688d6115601937f4bde7727df70ebea15b (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=f54c9f6cc39e805dfd62aae255c4870da312de19
commit f54c9f6cc39e805dfd62aae255c4870da312de19
Merge: 7feece6 cf04da7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jul 26 11:11:55 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Jul 26 07:12:08 2019 -0400

    Merge topic 'FindMPI-link-flags'
    
    cf04da7e70 FindMPI: make sure computed link flags are not de-duplicated
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Tested-by: Ben Boeckel <ben.boeckel at kitware.com>
    Tested-by: Robert Maynard <robert.maynard at kitware.com>
    Acked-by: Axel Huebl <axel.huebl at plasma.ninja>
    Merge-request: !3605


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf04da7e702014c7cc163dd4a78bccdeff813210
commit cf04da7e702014c7cc163dd4a78bccdeff813210
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Thu Jul 25 12:00:50 2019 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 25 12:59:21 2019 -0400

    FindMPI: make sure computed link flags are not de-duplicated
    
    In commit f7eaa342de (FindMPI: Store imported target link flags as a
    list instead of a string, 2019-06-14, v3.15.0-rc2~2^2) we used
    `separate_arguments` to parse the extracted link flags and add them to
    `INTERFACE_LINK_LIBRARIES`.  That property is not meant for link flags
    and CMake may de-duplicate them.  This is particularly problematic for
    flags like `-Wl,-rpath -Wl,/path1 -Wl,-rpath -Wl,/path2`.
    
    In commit 39c572c9c9 (FindMPI: Updated to use INTERFACE_LINK_OPTIONS,
    2019-06-24) we moved the parsed flags over to `INTERFACE_LINK_OPTIONS`,
    but that may still perform de-duplication.  Avoid the parsing and
    de-duplication of flags by passing the original string via `SHELL:`
    instead.
    
    Fixes: #19516

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index fc9810c..9471be8 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -1143,9 +1143,7 @@ macro(_MPI_create_imported_target LANG)
   set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_COMPILE_DEFINITIONS "${MPI_${LANG}_COMPILE_DEFINITIONS}")
 
   if(MPI_${LANG}_LINK_FLAGS)
-    separate_arguments(_MPI_${LANG}_LINK_FLAGS NATIVE_COMMAND "${MPI_${LANG}_LINK_FLAGS}")
-    set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_LINK_OPTIONS "${_MPI_${LANG}_LINK_FLAGS}")
-    unset(_MPI_${LANG}_LINK_FLAGS)
+    set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_LINK_OPTIONS "SHELL:${MPI_${LANG}_LINK_FLAGS}")
   endif()
   # If the compiler links MPI implicitly, no libraries will be found as they're contained within
   # CMAKE_<LANG>_IMPLICIT_LINK_LIBRARIES already.

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

Summary of changes:
 Modules/FindMPI.cmake | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


hooks/post-receive
-- 
CMake