Merge branch 'FindCUDA-deprecate-cublas_device' into release-3.12

Merge-request: !2298

Merge branch 'FindCUDA-deprecate-cublas_device' into release-3.12
Merge-request: !2298
d5151129 · Brad King · a173118f · bdf1f361 · d5151129
Commit d5151129 authored Aug 23, 2018 by Brad King
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Modules/FindCUDA.cmake Modules/FindCUDA.cmake +2 -1

No files found.
--- 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()