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
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

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

No files found.
--- a/modules/gpu/CMakeLists.txt
+++ b/modules/gpu/CMakeLists.txt
@@ -46,15 +46,15 @@ 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)
-    set(cuda_link_libs ${cuda_link_libs} ${CUDA_nvcuvenc_LIBRARY})
-  endif()
+    if(WIN32)
+      find_cuda_helper_libs(nvcuvenc)
+      set(cuda_link_libs ${cuda_link_libs} ${CUDA_nvcuvenc_LIBRARY})
+    endif()

-  if(WITH_FFMPEG)
-    set(cuda_link_libs ${cuda_link_libs} ${HIGHGUI_LIBRARIES})
+    if(WITH_FFMPEG)
+      set(cuda_link_libs ${cuda_link_libs} ${HIGHGUI_LIBRARIES})
+    endif()
  endif()
 else()
  set(lib_cuda "")