diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-02-28 05:34:31 -0800 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-02-28 05:34:31 -0800 |
| commit | 3b509c54355fb5c51ab55661e50895d6de3588e8 (patch) | |
| tree | 6e6ed648fd8ae7c663cd2805cedbbab7334a16c9 | |
| parent | 21ca74dc420cc2831de95af7cce9931225aaff66 (diff) | |
| parent | df4f0c0e5a4655b496b85bc6f22ca5027b67261e (diff) | |
| download | vcpkg-3b509c54355fb5c51ab55661e50895d6de3588e8.tar.gz vcpkg-3b509c54355fb5c51ab55661e50895d6de3588e8.zip | |
Merge branch 'dev/grdowns/4217' of https://github.com/microsoft/vcpkg into dev/grdowns/4217
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index a9ad1bb7f..07788c261 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -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() |