diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-22 14:45:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-11-22 14:45:21 (GMT) |
| commit | 0a802d0f9ef2b0a0150382d6e988f5d2a78eeb64 (patch) | |
| tree | 375a6d5cf06efde0057f876c6ec546c8dd8f4865 | |
| parent | 87f7553754bfa0bc2972920e21bb43a142868305 (diff) | |
| parent | 3ddfdc38eb6ffe67e827fe31bf8a68e0b29574e0 (diff) | |
| download | CMake-0a802d0f9ef2b0a0150382d6e988f5d2a78eeb64.zip CMake-0a802d0f9ef2b0a0150382d6e988f5d2a78eeb64.tar.gz CMake-0a802d0f9ef2b0a0150382d6e988f5d2a78eeb64.tar.bz2 | |
Merge topic 'FindCUDA-nppicom' into release-3.25
3ddfdc38eb FindCUDA: Do not use CUDA_nppicom_LIBRARY in CUDA 11.0+
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7938
| -rw-r--r-- | Modules/FindCUDA.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index 470111f..c928157 100644 --- a/Modules/FindCUDA.cmake +++ b/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) |