From 073a7ff95acedd3bcc61e5552c629695292125d0 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Tue, 23 Sep 2014 22:06:12 +0200 Subject: [PATCH] Fixed CMake issue with FFMPEG highgui configuration 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. --- modules/highgui/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index 9abd96019..3a7826ad4 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -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()