Skip to content

O
opencv
Commit 655b22e0 authored by Artur Wieczorek's avatar Artur Wieczorek
Browse files
Options

Fixed CMake issue with FFMPEG videoio configuration

parent e6f653af
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/videoio/CMakeLists.txt
View file @ 655b22e0
...@@ -18,13 +18,11 @@ endif() ...@@ -18,13 +18,11 @@ endif()
set(videoio_hdrs set(videoio_hdrs
${CMAKE_CURRENT_LIST_DIR}/src/precomp.hpp ${CMAKE_CURRENT_LIST_DIR}/src/precomp.hpp
${CMAKE_CURRENT_LIST_DIR}/src/cap_ffmpeg_impl.hpp
) )
set(videoio_srcs set(videoio_srcs
${CMAKE_CURRENT_LIST_DIR}/src/cap.cpp ${CMAKE_CURRENT_LIST_DIR}/src/cap.cpp
${CMAKE_CURRENT_LIST_DIR}/src/cap_images.cpp ${CMAKE_CURRENT_LIST_DIR}/src/cap_images.cpp
${CMAKE_CURRENT_LIST_DIR}/src/cap_ffmpeg.cpp
) )
file(GLOB videoio_ext_hdrs file(GLOB videoio_ext_hdrs
...@@ -111,6 +109,8 @@ if(HAVE_XIMEA) ...@@ -111,6 +109,8 @@ if(HAVE_XIMEA)
endif(HAVE_XIMEA) endif(HAVE_XIMEA)
if(HAVE_FFMPEG) if(HAVE_FFMPEG)
list(APPEND videoio_hdrs ${CMAKE_CURRENT_LIST_DIR}/src/cap_ffmpeg_impl.hpp)
list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_ffmpeg.cpp)
if(UNIX AND BZIP2_LIBRARIES) if(UNIX AND BZIP2_LIBRARIES)
list(APPEND VIDEOIO_LIBRARIES ${BZIP2_LIBRARIES}) list(APPEND VIDEOIO_LIBRARIES ${BZIP2_LIBRARIES})
endif() endif()
......
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