Merge pull request #5572 from paroj:nov4l1

d5894ef2 · Alexander Alekhin · 8d921129 · 955f4896 · d5894ef2 · d5894ef2
Commit d5894ef2 authored Dec 02, 2015 by Alexander Alekhin
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

cap_v4l.cpp modules/videoio/src/cap_v4l.cpp +0 -0

No files found.
--- a/modules/videoio/CMakeLists.txt
+++ b/modules/videoio/CMakeLists.txt
@@ -101,7 +101,7 @@ endif(HAVE_UNICAP)

 if(HAVE_LIBV4L)
  list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_libv4l.cpp)
-elseif(HAVE_CAMV4L OR HAVE_CAMV4L2 OR HAVE_VIDEOIO)
+elseif(HAVE_CAMV4L2 OR HAVE_VIDEOIO)
  list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_v4l.cpp)
 endif()


--- a/modules/videoio/src/cap_v4l.cpp
+++ b/modules/videoio/src/cap_v4l.cpp