Browse Source

FindCUDA: Do not use CUDA_nppicom_LIBRARY in CUDA 11.0+

Extend the change from commit 1d9f2f9714 (FindCUDA: Do not search for
the deprecated nppicom when CUDA >= 11, 2020-06-22, v3.18.0-rc3~14^2)
to also not use the `CUDA_nppicom_LIBRARY` variable.

Issue: #20845
Oleksii Udod 3 years ago
parent
commit
3ddfdc38eb
1 changed files with 3 additions and 1 deletions
  1. 3 1
      Modules/FindCUDA.cmake

+ 3 - 1
Modules/FindCUDA.cmake

@@ -1150,8 +1150,10 @@ if(NOT CUDA_VERSION VERSION_LESS "9.0")
   find_cuda_helper_libs(nppc)
   find_cuda_helper_libs(nppial)
   find_cuda_helper_libs(nppicc)
+  set(CUDA_npp_LIBRARY ${CUDA_nppc_LIBRARY} ${CUDA_nppial_LIBRARY} ${CUDA_nppicc_LIBRARY})
   if(CUDA_VERSION VERSION_LESS "11.0")
     find_cuda_helper_libs(nppicom)
+    list(APPEND CUDA_npp_LIBRARY ${CUDA_nppicom_LIBRARY})
   endif()
   find_cuda_helper_libs(nppidei)
   find_cuda_helper_libs(nppif)
@@ -1161,7 +1163,7 @@ if(NOT CUDA_VERSION VERSION_LESS "9.0")
   find_cuda_helper_libs(nppisu)
   find_cuda_helper_libs(nppitc)
   find_cuda_helper_libs(npps)
-  set(CUDA_npp_LIBRARY "${CUDA_nppc_LIBRARY};${CUDA_nppial_LIBRARY};${CUDA_nppicc_LIBRARY};${CUDA_nppicom_LIBRARY};${CUDA_nppidei_LIBRARY};${CUDA_nppif_LIBRARY};${CUDA_nppig_LIBRARY};${CUDA_nppim_LIBRARY};${CUDA_nppist_LIBRARY};${CUDA_nppisu_LIBRARY};${CUDA_nppitc_LIBRARY};${CUDA_npps_LIBRARY}")
+  list(APPEND CUDA_npp_LIBRARY ${CUDA_nppidei_LIBRARY} ${CUDA_nppif_LIBRARY} ${CUDA_nppig_LIBRARY} ${CUDA_nppim_LIBRARY} ${CUDA_nppist_LIBRARY} ${CUDA_nppisu_LIBRARY} ${CUDA_nppitc_LIBRARY} ${CUDA_npps_LIBRARY})
 elseif(CUDA_VERSION VERSION_GREATER "5.0")
   # In CUDA 5.5 NPP was split into 3 separate libraries.
   find_cuda_helper_libs(nppc)