From 469cc42aee191ac8356358ee7567c98dfb047224 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 20 Feb 2012 13:12:13 +0000 Subject: [PATCH] Fixing ffmpeg dll copying on Windows --- 3rdparty/ffmpeg/CMakeLists.txt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/3rdparty/ffmpeg/CMakeLists.txt b/3rdparty/ffmpeg/CMakeLists.txt index f689a66021..e3fda991a6 100644 --- a/3rdparty/ffmpeg/CMakeLists.txt +++ b/3rdparty/ffmpeg/CMakeLists.txt @@ -7,14 +7,10 @@ endif() 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_traincascade LOCATION) -get_filename_component(bin_dir ${bin_dir} PATH) - -message(STATUS "ffmpeg output dir: ${bin_dir}") +message(STATUS "ffmpeg output dir: ${EXECUTABLE_OUTPUT_PATH}") add_custom_target(opencv_ffmpeg ALL - COMMAND ${CMAKE_COMMAND} -E copy - ${module_name} ${bin_dir}/${module_bare_name} + COMMAND ${CMAKE_COMMAND} -E copy "${module_name}" "${EXECUTABLE_OUTPUT_PATH}/${module_bare_name}" COMMENT "Copying ${module_name} to the output directory") install(FILES ${module_name} DESTINATION bin COMPONENT main)