diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-23 11:55:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-23 11:55:40 (GMT) |
| commit | df69cb37d197e0eb995f0616e864c748c71ab7a7 (patch) | |
| tree | 08482179713181f0eb27c45f1d3d8b79f333c926 | |
| parent | 86cd7d67d30f255b660590f60928429db8e725cf (diff) | |
| parent | 1d9f2f9714af3cd9f43975456c4be03c2df463ad (diff) | |
| download | CMake-df69cb37d197e0eb995f0616e864c748c71ab7a7.zip CMake-df69cb37d197e0eb995f0616e864c748c71ab7a7.tar.gz CMake-df69cb37d197e0eb995f0616e864c748c71ab7a7.tar.bz2 | |
Merge topic 'FindCUDA-11' into release-3.18
1d9f2f9714 FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4929
| -rw-r--r-- | Modules/FindCUDA.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index e1af2d6..a93d4fd 100644 --- a/Modules/FindCUDA.cmake +++ b/Modules/FindCUDA.cmake @@ -357,7 +357,8 @@ The script defines the following variables:: CUDA_nppicc_LIBRARY -- NVIDIA Performance Primitives lib (image processing). Only available for CUDA version 9.0. CUDA_nppicom_LIBRARY -- NVIDIA Performance Primitives lib (image processing). - Only available for CUDA version 9.0. + Only available for CUDA version 9.0 - 10.2. + Replaced by nvjpeg. CUDA_nppidei_LIBRARY -- NVIDIA Performance Primitives lib (image processing). Only available for CUDA version 9.0. CUDA_nppif_LIBRARY -- NVIDIA Performance Primitives lib (image processing). @@ -1002,7 +1003,9 @@ if(NOT CUDA_VERSION VERSION_LESS "9.0") find_cuda_helper_libs(nppc) find_cuda_helper_libs(nppial) find_cuda_helper_libs(nppicc) - find_cuda_helper_libs(nppicom) + if(CUDA_VERSION VERSION_LESS "11.0") + find_cuda_helper_libs(nppicom) + endif() find_cuda_helper_libs(nppidei) find_cuda_helper_libs(nppif) find_cuda_helper_libs(nppig) |