diff options
| author | Brad King <brad.king@kitware.com> | 2018-10-25 11:25:43 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-10-25 07:26:24 -0400 |
| commit | 69275d3b6a9787268f7bd80bb24d8e4cbb18710e (patch) | |
| tree | 0bb53670308ea913e9b22c6471bf7fec3f1b36da /Modules/FindThreads.cmake | |
| parent | 1c31eae65982c84d570217dd1493eb1d2ba6ee45 (diff) | |
| parent | 2cc050b53b4afb1ed62621360b860e25b7c46015 (diff) | |
| download | cmake-69275d3b6a9787268f7bd80bb24d8e4cbb18710e.tar.gz | |
Merge topic 'cuda-thread-flags'
2cc050b53b CUDA: Add test for device linking when host linking uses threads
83c13ca44f FindThreads: Pass -pthread to CUDA compiler through -Xcompiler
cf92fd9ae9 Merge branch 'cuda-filter-device-link-items' into cuda-thread-flags
e768d96c74 CUDA: Filter out host link flags during device linking
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kelly (KT) Thompson <kgt@lanl.gov>
Merge-request: !2512
Diffstat (limited to 'Modules/FindThreads.cmake')
| -rw-r--r-- | Modules/FindThreads.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindThreads.cmake b/Modules/FindThreads.cmake index 221108182c..dfb683f32d 100644 --- a/Modules/FindThreads.cmake +++ b/Modules/FindThreads.cmake @@ -209,7 +209,9 @@ if(THREADS_FOUND AND NOT TARGET Threads::Threads) add_library(Threads::Threads INTERFACE IMPORTED) if(THREADS_HAVE_PTHREAD_ARG) - set_property(TARGET Threads::Threads PROPERTY INTERFACE_COMPILE_OPTIONS "-pthread") + set_property(TARGET Threads::Threads + PROPERTY INTERFACE_COMPILE_OPTIONS "$<$<COMPILE_LANGUAGE:CUDA>:SHELL:-Xcompiler -pthread>" + "$<$<NOT:$<COMPILE_LANGUAGE:CUDA>>:-pthread>") endif() if(CMAKE_THREAD_LIBS_INIT) |