diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-03-12 04:14:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-11 12:14:34 -0800 |
| commit | 2543be2edf60bf38511c2d477bb17b617398a108 (patch) | |
| tree | fadea369f0375b22adf71ec594aacb8af23a5328 /ports/ffmpeg | |
| parent | f2ae282c8d7c2a4a5a8e2b88ae42723261b7b298 (diff) | |
| download | vcpkg-2543be2edf60bf38511c2d477bb17b617398a108.tar.gz vcpkg-2543be2edf60bf38511c2d477bb17b617398a108.zip | |
[pangolin] Fix static build error (#15593)
* [pangolin] Fix static build error
* Update versions
* Update dependency for pangolin
* Update pangolin.json
Diffstat (limited to 'ports/ffmpeg')
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/vcpkg-cmake-wrapper.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index dc32fe3a4..fff2ce9f5 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,6 +1,6 @@ Source: ffmpeg Version: 4.3.1 -Port-Version: 11 +Port-Version: 12 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. FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations. diff --git a/ports/ffmpeg/vcpkg-cmake-wrapper.cmake b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake index 8e2dd44d0..170bf6333 100644 --- a/ports/ffmpeg/vcpkg-cmake-wrapper.cmake +++ b/ports/ffmpeg/vcpkg-cmake-wrapper.cmake @@ -1,6 +1,8 @@ set(FFMPEG_PREV_MODULE_PATH ${CMAKE_MODULE_PATH}) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) +cmake_policy(SET CMP0012 NEW) + _find_package(${ARGS}) set(CMAKE_MODULE_PATH ${FFMPEG_PREV_MODULE_PATH}) |