Merge branch 'dev/grdowns/4217' of https://github.com/microsoft/vcpkg into dev/grdowns/4217

This commit is contained in:
Griffin Downs 2019-02-28 05:34:31 -08:00
commit 3b509c5435

View File

@ -68,6 +68,12 @@ else()
set(OPTIONS "${OPTIONS} --disable-ffmpeg")
endif()
if("ffmpeg" IN_LIST FEATURES)
set(OPTIONS "${OPTIONS} --enable-ffmpeg")
else()
set(OPTIONS "${OPTIONS} --disable-ffmpeg")
endif()
if("ffplay" IN_LIST FEATURES)
set(OPTIONS "${OPTIONS} --enable-ffplay")
else()