summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-08-20 11:55:16 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-08-20 11:55:23 (GMT)
commit4fc1dd2ff1ee2d9dd5771b44070bf1750c60a939 (patch)
treea580c2f807a1dd6677bd090745877b526bd44673 /Modules
parent590b8791a0bd26c72bc4a007e98a1d7eabe9dc07 (diff)
parent47abe5f2251f5e31c2da428cd8d92ba56844856c (diff)
downloadCMake-4fc1dd2ff1ee2d9dd5771b44070bf1750c60a939.zip
CMake-4fc1dd2ff1ee2d9dd5771b44070bf1750c60a939.tar.gz
CMake-4fc1dd2ff1ee2d9dd5771b44070bf1750c60a939.tar.bz2
Merge topic 'FindMPI-cuda-pthread' into release-3.18
47abe5f225 FindMPI: Fix regression in pthread guard Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Raul Tambre <raul@tambre.ee> Merge-request: !5147
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindMPI.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 25de562..bbd40a4 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -1157,7 +1157,7 @@ macro(_MPI_create_imported_target LANG)
string(REPLACE "-pthread" "$<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:SHELL:-Xcompiler >-pthread"
_MPI_${LANG}_COMPILE_OPTIONS "${MPI_${LANG}_COMPILE_OPTIONS}")
string(REPLACE "-fexceptions" "$<$<COMPILE_LANG_AND_ID:CUDA,NVIDIA>:SHELL:-Xcompiler >-fexceptions"
- _MPI_${LANG}_COMPILE_OPTIONS "${MPI_${LANG}_COMPILE_OPTIONS}")
+ _MPI_${LANG}_COMPILE_OPTIONS "${_MPI_${LANG}_COMPILE_OPTIONS}")
set_property(TARGET MPI::MPI_${LANG} PROPERTY INTERFACE_COMPILE_OPTIONS "${_MPI_${LANG}_COMPILE_OPTIONS}")
unset(_MPI_${LANG}_COMPILE_OPTIONS)