ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)

3ee90a1f · Alexander Alekhin · 613b2893 · 3ee90a1f
Commit 3ee90a1f authored Dec 18, 2015 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

CMakeLists.txt modules/videoio/CMakeLists.txt +5 -0

No files found.
--- 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()