Merge pull request #7897 from alalek:fix_ffmpeg_check

cmake: fix ffmpeg check code (port into master #7893)
This commit is contained in:
Alexander Alekhin 2016-12-19 16:18:49 +02:00 committed by GitHub
commit ccd32f6608

View File

@ -236,6 +236,7 @@ if(WITH_FFMPEG)
if(NOT __VALID_FFMPEG)
#message(FATAL_ERROR "FFMPEG: test check build log:\n${TRY_OUT}")
message(STATUS "WARNING: Can't build ffmpeg test code")
set(HAVE_FFMPEG FALSE)
else()
ocv_append_build_options(VIDEOIO FFMPEG)
endif()