diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2020-06-22 15:48:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-06-22 15:56:51 (GMT) |
| commit | 1d9f2f9714af3cd9f43975456c4be03c2df463ad (patch) | |
| tree | 6f512f06891a00266e1e1b8db34130da25011947 | |
| parent | e66fe75792a2fbe9f3ffe237c748008906ae7116 (diff) | |
| download | CMake-1d9f2f9714af3cd9f43975456c4be03c2df463ad.zip CMake-1d9f2f9714af3cd9f43975456c4be03c2df463ad.tar.gz CMake-1d9f2f9714af3cd9f43975456c4be03c2df463ad.tar.bz2 | |
FindCUDA: Do not search for the deprecated nppicom when CUDA >= 11
The nppicom library has been removed in preference of nvjpeg starting
in CUDA 11.
Fixes: #20845
| -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) |