Skip to content

O
opencv
Commit ccd32f66 authored by Alexander Alekhin's avatar Alexander Alekhin Committed by GitHub
Browse files
Options

Merge pull request #7897 from alalek:fix_ffmpeg_check 

cmake: fix ffmpeg check code (port into master #7893)
parents 2638abe1 3e1695d6
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
cmake/OpenCVFindLibsVideo.cmake
View file @ ccd32f66
...@@ -236,6 +236,7 @@ if(WITH_FFMPEG) ...@@ -236,6 +236,7 @@ if(WITH_FFMPEG)
if(NOT __VALID_FFMPEG) if(NOT __VALID_FFMPEG)
#message(FATAL_ERROR "FFMPEG: test check build log:\n${TRY_OUT}") #message(FATAL_ERROR "FFMPEG: test check build log:\n${TRY_OUT}")
message(STATUS "WARNING: Can't build ffmpeg test code") message(STATUS "WARNING: Can't build ffmpeg test code")
set(HAVE_FFMPEG FALSE)
else() else()
ocv_append_build_options(VIDEOIO FFMPEG) ocv_append_build_options(VIDEOIO FFMPEG)
endif() endif()
......
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