Skip to content

O
opencv
Commit 7db6c314 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

corrected opencv_ffmpeg.dll copying when the target dir does not exists yet

parent 391603e2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
3rdparty/ffmpeg/CMakeLists.txt
View file @ 7db6c314
...@@ -4,7 +4,8 @@ if(MSVC64 OR MINGW64) ...@@ -4,7 +4,8 @@ if(MSVC64 OR MINGW64)
set(FFMPEG_SUFFIX _64) set(FFMPEG_SUFFIX _64)
endif() endif()
set(module_name "${CMAKE_CURRENT_SOURCE_DIR}/opencv_ffmpeg${FFMPEG_SUFFIX}.dll") set(module_bare_name "opencv_ffmpeg${FFMPEG_SUFFIX}.dll")
set(module_name "${CMAKE_CURRENT_SOURCE_DIR}/${module_bare_name}")
get_target_property(bin_dir opencv_core LOCATION) get_target_property(bin_dir opencv_core LOCATION)
get_filename_component(bin_dir ${bin_dir} PATH) get_filename_component(bin_dir ${bin_dir} PATH)
...@@ -13,7 +14,7 @@ message(STATUS "ffmpeg output dir: ${bin_dir}") ...@@ -13,7 +14,7 @@ message(STATUS "ffmpeg output dir: ${bin_dir}")
add_custom_target(opencv_ffmpeg ALL add_custom_target(opencv_ffmpeg ALL
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${module_name} ${bin_dir} ${module_name} ${bin_dir}/${module_bare_name}
COMMENT "Copying ${module_name} to the output directory") COMMENT "Copying ${module_name} to the output directory")
install(FILES ${module_name} DESTINATION bin COMPONENT main) install(FILES ${module_name} DESTINATION bin COMPONENT main)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment