From 4c0007b55ac4fcad9969c561c592fbc63c07c871 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 28 May 2018 15:30:50 +0200 Subject: [PATCH] Fix #4672: Check if FFMPEG and OpenH264 detected When FFMPEG or OpenH264 was requested but not detected abort the cmake run with an error. --- CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f311ff4a..70bc79a47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -881,6 +881,16 @@ find_feature(FAAC ${FAAC_FEATURE_TYPE} ${FAAC_FEATURE_PURPOSE} ${FAAC_FEATURE_DE find_feature(GSSAPI ${GSSAPI_FEATURE_TYPE} ${GSSAPI_FEATURE_PURPOSE} ${GSSAPI_FEATURE_DESCRIPTION}) +if (WITH_FFMPEG AND NOT FFmpeg_FOUND) + message(FATAL_ERROR "FFMPEG support requested but not detected") +endif() +set(WITH_FFMPEG ${FFmpeg_FOUND}) + +if (WITH_OPENH264 AND NOT OpenH264_FOUND) + message(FATAL_ERROR "OpenH264 support requested but not detected") +endif() +set(WITH_OPENH264 ${OpenH264_FOUND}) + if ( (WITH_GSSAPI) AND (NOT GSS_FOUND)) message(WARNING "-DWITH_GSSAPI=ON is set, but not GSSAPI implementation was found, disabling") elseif(WITH_GSSAPI)