generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

link with nvcuvenc and ffmpeg libraries only if WITH_NVCUVID is enabled

Browse Source
This commit is contained in:
Vladislav Vinogradov 2013-06-13 16:46:34 +04:00
parent 7aac543570
commit 0367a7f992
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/CMakeLists.txt
View File

@ -46,7 +46,6 @@ if(HAVE_CUDA)
if(WITH_NVCUVID) if(WITH_NVCUVID)
set(cuda_link_libs ${cuda_link_libs} ${CUDA_CUDA_LIBRARY} ${CUDA_nvcuvid_LIBRARY}) set(cuda_link_libs ${cuda_link_libs} ${CUDA_CUDA_LIBRARY} ${CUDA_nvcuvid_LIBRARY})
endif()
if(WIN32) if(WIN32)
find_cuda_helper_libs(nvcuvenc) find_cuda_helper_libs(nvcuvenc)
@ -56,6 +55,7 @@ if(HAVE_CUDA)
if(WITH_FFMPEG) if(WITH_FFMPEG)
set(cuda_link_libs ${cuda_link_libs} ${HIGHGUI_LIBRARIES}) set(cuda_link_libs ${cuda_link_libs} ${HIGHGUI_LIBRARIES})
endif() endif()
endif()
else() else()
set(lib_cuda "") set(lib_cuda "")
set(cuda_objs "") set(cuda_objs "")