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

Merge pull request #1238 from SpecLad:cmake-min-ver

Browse Source
This commit is contained in:
Roman Donchenko
2013-08-12 15:50:23 +04:00
committed by OpenCV Buildbot
parent 19d8f4f8dd afc6f79038
commit d8c6e89a54
11 changed files with 17 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/highgui/CMakeLists.txt
View File

@@ -293,11 +293,6 @@ if(WIN32 AND WITH_FFMPEG)
set(ffmpeg_bare_name_ver "opencv_ffmpeg${OPENCV_DLLVERSION}${FFMPEG_SUFFIX}.dll")
set(ffmpeg_path "${OpenCV_SOURCE_DIR}/3rdparty/ffmpeg/${ffmpeg_bare_name}")
#if(MSVC AND CMAKE_VERSION VERSION_GREATER "2.8.2")
# add_custom_command(TARGET ${the_module} POST_BUILD
# COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/$<CONFIGURATION>/${ffmpeg_bare_name_ver}"
# COMMENT "Copying ${ffmpeg_path} to the output directory")
#else
if(MSVC_IDE)
add_custom_command(TARGET ${the_module} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy "${ffmpeg_path}" "${EXECUTABLE_OUTPUT_PATH}/Release/${ffmpeg_bare_name_ver}"