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

Fixing ffmpeg dll copying on Windows

Browse Source
This commit is contained in:
Andrey Kamaev 2012-02-20 13:43:06 +00:00
parent 469cc42aee
commit 30191dbe95
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
3rdparty/ffmpeg/CMakeLists.txt vendored
View File

@ -9,8 +9,18 @@ set(module_name "${CMAKE_CURRENT_SOURCE_DIR}/${module_bare_name}")
message(STATUS "ffmpeg output dir: ${EXECUTABLE_OUTPUT_PATH}") message(STATUS "ffmpeg output dir: ${EXECUTABLE_OUTPUT_PATH}")
if(CMAKE_VERSION VERSION_GREATER "2.8.2")
add_custom_target(opencv_ffmpeg ALL
COMMAND ${CMAKE_COMMAND} -E copy "${module_name}" "${EXECUTABLE_OUTPUT_PATH}/$<CONFIGURATION>/${module_bare_name}"
COMMENT "Copying ${module_name} to the output directory")
elseif(MSVC)
add_custom_target(opencv_ffmpeg ALL
COMMAND ${CMAKE_COMMAND} -E copy "${module_name}" "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/${module_bare_name}"
COMMENT "Copying ${module_name} to the output directory")
else()
add_custom_target(opencv_ffmpeg ALL add_custom_target(opencv_ffmpeg ALL
COMMAND ${CMAKE_COMMAND} -E copy "${module_name}" "${EXECUTABLE_OUTPUT_PATH}/${module_bare_name}" COMMAND ${CMAKE_COMMAND} -E copy "${module_name}" "${EXECUTABLE_OUTPUT_PATH}/${module_bare_name}"
COMMENT "Copying ${module_name} to the output directory") COMMENT "Copying ${module_name} to the output directory")
endif()
install(FILES ${module_name} DESTINATION bin COMPONENT main) install(FILES ${module_name} DESTINATION bin COMPONENT main)