diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-02 11:53:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-02 11:53:41 (GMT) |
| commit | daba4a02500b3886d85685b0b4a8efaad19d9551 (patch) | |
| tree | a0f0744adb08e32f7e58b21517e5c0aec5a5cb09 | |
| parent | 8fb7a124cba9b8512aa4ad84ab1add88f57cda05 (diff) | |
| parent | 666f689e48c15c3d0bd524b43beb62dd16790ace (diff) | |
| download | CMake-daba4a02500b3886d85685b0b4a8efaad19d9551.zip CMake-daba4a02500b3886d85685b0b4a8efaad19d9551.tar.gz CMake-daba4a02500b3886d85685b0b4a8efaad19d9551.tar.bz2 | |
Merge topic 'FindMPI-host_link' into release-3.20
666f689e48 FindMPI: avoid host link options to be propagated to device link step
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !5966
| -rw-r--r-- | Modules/FindMPI.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 195ca49..de38ac2 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -1182,9 +1182,10 @@ 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) - string(REPLACE "-pthread" "$<$<LINK_LANG_AND_ID:CUDA,NVIDIA>:-Xlinker >-pthread" - _MPI_${LANG}_LINK_FLAGS "${MPI_${LANG}_LINK_FLAGS}") - set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_LINK_OPTIONS "SHELL:${MPI_${LANG}_LINK_FLAGS}") + string(REPLACE "," "$<COMMA>" _MPI_${LANG}_LINK_FLAGS "${MPI_${LANG}_LINK_FLAGS}") + string(PREPEND _MPI_${LANG}_LINK_FLAGS "$<HOST_LINK:SHELL:") + string(APPEND _MPI_${LANG}_LINK_FLAGS ">") + set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_LINK_OPTIONS "${_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. |