From 1d9f2f9714af3cd9f43975456c4be03c2df463ad Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Mon, 22 Jun 2020 11:48:23 -0400 Subject: 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 --- Modules/FindCUDA.cmake | 7 +++++-- 1 file 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) -- cgit v0.12