diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-08 12:26:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-08 12:26:43 (GMT) |
| commit | cb0080d520d2521450cbb4ac8222b8381bedf3a8 (patch) | |
| tree | aa4f5fcdd1c69f2299911d03d2cc2820fc1b8ad3 /Modules | |
| parent | bc185531faff2bb829b3d165e832808adf226fe0 (diff) | |
| parent | 33192e1b5f1cc8cce95f4d69cf7ecf0b6269f84b (diff) | |
| download | CMake-cb0080d520d2521450cbb4ac8222b8381bedf3a8.zip CMake-cb0080d520d2521450cbb4ac8222b8381bedf3a8.tar.gz CMake-cb0080d520d2521450cbb4ac8222b8381bedf3a8.tar.bz2 | |
Merge topic 'FindMPI-nvcc-link-pthread' into release-3.18
33192e1b5f FindMPI: Pass -pthread to NVCC through -Xlinker for device linking
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4981
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindMPI.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 45c0eb0..25de562 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -1164,6 +1164,8 @@ 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}") endif() # If the compiler links MPI implicitly, no libraries will be found as they're contained within |