Commit 421be814 authored by Eyal Rozenberg's avatar Eyal Rozenberg Committed by Brad King
Browse files

FindCUDA: Add nvToolsExt and OpenCL libraries

Find these libraries with CUDA 5 and above.

Fixes: #19386
parent 77e59e44
...@@ -375,6 +375,11 @@ The script defines the following variables:: ...@@ -375,6 +375,11 @@ The script defines the following variables::
CUDA_nvcuvid_LIBRARY -- CUDA Video Decoder library. CUDA_nvcuvid_LIBRARY -- CUDA Video Decoder library.
Only available for CUDA version 3.2+. Only available for CUDA version 3.2+.
Windows only. Windows only.
CUDA_nvToolsExt_LIBRARY
-- NVIDA CUDA Tools Extension library.
Available for CUDA version 5+.
CUDA_OpenCL_LIBRARY -- NVIDA CUDA OpenCL library.
Available for CUDA version 5+.
#]=======================================================================] #]=======================================================================]
...@@ -642,6 +647,8 @@ macro(cuda_unset_include_and_libraries) ...@@ -642,6 +647,8 @@ macro(cuda_unset_include_and_libraries)
unset(CUDA_npps_LIBRARY CACHE) unset(CUDA_npps_LIBRARY CACHE)
unset(CUDA_nvcuvenc_LIBRARY CACHE) unset(CUDA_nvcuvenc_LIBRARY CACHE)
unset(CUDA_nvcuvid_LIBRARY CACHE) unset(CUDA_nvcuvid_LIBRARY CACHE)
unset(CUDA_nvToolsExt_LIBRARY CACHE)
unset(CUDA_OpenCL_LIBRARY CACHE)
unset(CUDA_GPU_DETECT_OUTPUT CACHE) unset(CUDA_GPU_DETECT_OUTPUT CACHE)
endmacro() endmacro()
...@@ -973,6 +980,11 @@ if(CUDA_VERSION VERSION_GREATER "5.0" AND CUDA_VERSION VERSION_LESS "9.2") ...@@ -973,6 +980,11 @@ if(CUDA_VERSION VERSION_GREATER "5.0" AND CUDA_VERSION VERSION_LESS "9.2")
find_cuda_helper_libs(cublas_device) find_cuda_helper_libs(cublas_device)
endif() endif()
if(NOT CUDA_VERSION VERSION_LESS "5.0")
find_cuda_helper_libs(nvToolsExt)
find_cuda_helper_libs(OpenCL)
endif()
if(NOT CUDA_VERSION VERSION_LESS "9.0") if(NOT CUDA_VERSION VERSION_LESS "9.0")
# In CUDA 9.0 NPP was nppi was removed # In CUDA 9.0 NPP was nppi was removed
find_cuda_helper_libs(nppc) find_cuda_helper_libs(nppc)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment