From 8dae3431c7d39b49cf40bcacd93b2d19de1b9f54 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 23 Apr 2012 10:52:27 +0000 Subject: [PATCH] Fixed ffmpeg dll copying under mingw --- modules/highgui/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index 17d5a1a..3fe7d7c 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -279,7 +279,7 @@ if(WIN32 AND WITH_FFMPEG) set(ffmpeg_bare_name "opencv_ffmpeg${FFMPEG_SUFFIX}.dll") set(ffmpeg_path "${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/${ffmpeg_bare_name}") - if(CMAKE_VERSION VERSION_GREATER "2.8.2") + if(MSVC AND CMAKE_VERSION VERSION_GREATER "2.8.2") add_custom_command(TARGET ${the_module} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/$/${ffmpeg_bare_name}" COMMENT "Copying ${ffmpeg_path} to the output directory") -- 2.7.4