mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4683 from akallabeth/ffmpeg_found_fix 

Nightly build fix
This commit is contained in:
Martin Fleisz 2018-05-30 12:39:17 +02:00 committed by GitHub
parent fad23aab26 f8a1bb8451
commit 73588bc2b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -881,15 +881,15 @@ 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)
if (WITH_FFMPEG AND NOT FFMPEG_FOUND)
message(FATAL_ERROR "FFMPEG support requested but not detected")
endif()
set(WITH_FFMPEG ${FFmpeg_FOUND})
set(WITH_FFMPEG ${FFMPEG_FOUND})
if (WITH_OPENH264 AND NOT OpenH264_FOUND)
if (WITH_OPENH264 AND NOT OPENH264_FOUND)
message(FATAL_ERROR "OpenH264 support requested but not detected")
endif()
set(WITH_OPENH264 ${OpenH264_FOUND})
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")