From 3ee90a1ff4b67add06e2c5bbfd70dc10998ba94c Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 18 Dec 2015 15:06:19 +0300 Subject: [PATCH] ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings) --- modules/videoio/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt index b402ccd52d..b5da8d090d 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -266,6 +266,11 @@ if(WIN32 AND WITH_FFMPEG) endif() install(FILES "${ffmpeg_path}" DESTINATION ${OPENCV_BIN_INSTALL_PATH} COMPONENT libs RENAME "${ffmpeg_bare_name_ver}") + + if(INSTALL_CREATE_DISTRIB) + install(FILES "${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/opencv_ffmpeg.dll" DESTINATION "bin/" COMPONENT libs RENAME "opencv_ffmpeg${OPENCV_DLLVERSION}.dll") + install(FILES "${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/opencv_ffmpeg_64.dll" DESTINATION "bin/" COMPONENT libs RENAME "opencv_ffmpeg${OPENCV_DLLVERSION}_64.dll") + endif() endif() endmacro()