diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-23 18:51:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-08-23 18:51:47 (GMT) |
| commit | d51511290632a1ce57678346edd6e33203d4d55e (patch) | |
| tree | f621b83a3258ae2e9f539585612d1f1163bb3a1f | |
| parent | a173118f8c2c5242131150aa81b05049ad0a559c (diff) | |
| parent | bdf1f361354e3e0ecd4fd5ede2f38d5384a0444a (diff) | |
| download | CMake-d51511290632a1ce57678346edd6e33203d4d55e.zip CMake-d51511290632a1ce57678346edd6e33203d4d55e.tar.gz CMake-d51511290632a1ce57678346edd6e33203d4d55e.tar.bz2 | |
Merge branch 'FindCUDA-deprecate-cublas_device' into release-3.12
Merge-request: !2298
| -rw-r--r-- | Modules/FindCUDA.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 21cace3..1650e55 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -971,7 +971,8 @@ if(NOT CUDA_VERSION VERSION_LESS "3.2") find_cuda_helper_libs(nvcuvid) endif() endif() -if(CUDA_VERSION VERSION_GREATER "5.0") +if(CUDA_VERSION VERSION_GREATER "5.0" AND CUDA_VERSION VERSION_LESS "9.2") + # In CUDA 9.2 cublas_device was deprecated find_cuda_helper_libs(cublas_device) endif() |