summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-08-24 17:25:55 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-08-24 17:35:36 (GMT)
commite90670925f78dd46b8eacec9be81b456d63e104a (patch)
tree9b89d17b98c53fc086adebc9ce04a948def2561c
parent36f49faa3cdd18bac40c97f301a8d677dba8efa1 (diff)
parentbdf1f361354e3e0ecd4fd5ede2f38d5384a0444a (diff)
downloadCMake-e90670925f78dd46b8eacec9be81b456d63e104a.zip
CMake-e90670925f78dd46b8eacec9be81b456d63e104a.tar.gz
CMake-e90670925f78dd46b8eacec9be81b456d63e104a.tar.bz2
Merge topic 'FindCUDA-deprecate-cublas_device'
bdf1f36135 FindCUDA: Do not find cublas_device on CUDA >= 9.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2298
-rw-r--r--Modules/FindCUDA.cmake3
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()