Merge pull request #996 from jet47:gpu-nvcuvid-libraries

843094a0 · Roman Donchenko · OpenCV Buildbot · 7308a4a8 · 0367a7f9 · 843094a0
Commit 843094a0 authored Jun 14, 2013 by Roman Donchenko Committed by OpenCV Buildbot Jun 14, 2013
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

CMakeLists.txt modules/gpu/CMakeLists.txt +1 -1

No files found.
--- a/modules/gpu/CMakeLists.txt
+++ b/modules/gpu/CMakeLists.txt
@@ -46,7 +46,6 @@ if(HAVE_CUDA)

  if(WITH_NVCUVID)
    set(cuda_link_libs ${cuda_link_libs} ${CUDA_CUDA_LIBRARY} ${CUDA_nvcuvid_LIBRARY})
-  endif()

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