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

Fixed CMake issue with FFMPEG videoio configuration

Browse Source
This commit is contained in:
Artur Wieczorek
2014-09-25 12:37:38 +02:00
parent e6f653af44
commit 655b22e050
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/videoio/CMakeLists.txt
View File

@@ -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)
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()