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

Fixed CMake issue with FFMPEG highgui configuration

Browse Source 
Currently, FFMPEG source files are included in highgui project file regardless of CMake WITH_FFMPEG option.
After applying this PR FFMPEG files are included only if WITH_FFMPEG option is enabled.
This commit is contained in:
Artur Wieczorek 2014-09-23 22:06:12 +02:00
parent 10bbcca11e
commit 073a7ff95a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/CMakeLists.txt
View File

@ -54,13 +54,11 @@ source_group("Src\\grfmts" FILES ${grfmt_hdrs} ${grfmt_srcs})
set(highgui_hdrs
src/precomp.hpp
src/utils.hpp
src/cap_ffmpeg_impl.hpp
)
set(highgui_srcs
src/cap.cpp
src/cap_images.cpp
src/cap_ffmpeg.cpp
src/loadsave.cpp
src/utils.cpp
src/window.cpp
@ -186,6 +184,8 @@ if(HAVE_XIMEA)
endif(HAVE_XIMEA)
if(HAVE_FFMPEG)
list(APPEND highgui_hdrs src/cap_ffmpeg_impl.hpp)
list(APPEND highgui_srcs src/cap_ffmpeg.cpp)
if(UNIX AND BZIP2_LIBRARIES)
list(APPEND HIGHGUI_LIBRARIES ${BZIP2_LIBRARIES})
endif()