cmake scripts are updated to prefer includes from the OpenCV source tree
This commit is contained in:
26
3rdparty/ffmpeg/CMakeLists.txt
vendored
26
3rdparty/ffmpeg/CMakeLists.txt
vendored
@@ -1,26 +0,0 @@
|
||||
project(opencv_ffmpeg)
|
||||
|
||||
if(MSVC64 OR MINGW64)
|
||||
set(FFMPEG_SUFFIX _64)
|
||||
endif()
|
||||
|
||||
set(module_bare_name "opencv_ffmpeg${FFMPEG_SUFFIX}.dll")
|
||||
set(module_name "${CMAKE_CURRENT_SOURCE_DIR}/${module_bare_name}")
|
||||
|
||||
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
|
||||
COMMAND ${CMAKE_COMMAND} -E copy "${module_name}" "${EXECUTABLE_OUTPUT_PATH}/${module_bare_name}"
|
||||
COMMENT "Copying ${module_name} to the output directory")
|
||||
endif()
|
||||
|
||||
install(FILES ${module_name} DESTINATION bin COMPONENT main)
|
||||
Reference in New Issue
Block a user