diff options
| author | Vicki Pfau <vi@endrift.com> | 2020-08-01 17:13:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-01 17:13:08 -0700 |
| commit | b46242ff15f78a2da58548bda04850daf3ddca48 (patch) | |
| tree | 3a378c689ea76c2b1c31773ffb1ebb12584032c7 /ports/ffmpeg | |
| parent | d6565e146cb131ad818a29c7d531969277582b17 (diff) | |
| download | vcpkg-b46242ff15f78a2da58548bda04850daf3ddca48.tar.gz vcpkg-b46242ff15f78a2da58548bda04850daf3ddca48.zip | |
[many ports] Remove _find_package guards that break *_FOUND (#12157)
* [many ports] Remove _find_package guards that break *_FOUND
* [many ports] Fix incrementing version
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/ffmpeg')
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/vcpkg-cmake-wrapper.cmake | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index b48e2d42b..b9bdfcba2 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.2 -Port-Version: 14 +Port-Version: 16 Build-Depends: zlib Homepage: https://ffmpeg.org Description: a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. diff --git a/ports/ffmpeg/vcpkg-cmake-wrapper.cmake b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake index 322387565..8e2dd44d0 100644 --- a/ports/ffmpeg/vcpkg-cmake-wrapper.cmake +++ b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake @@ -1,8 +1,6 @@ set(FFMPEG_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) -if(NOT FFMPEG_LIBRARIES) - _find_package(${ARGS}) -endif() +_find_package(${ARGS}) set(CMAKE_MODULE_PATH ${FFMPEG_PREV_MODULE_PATH}) |