diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-03-19 15:28:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 00:28:10 -0700 |
| commit | 3d82def504f2cdf999e568bfdd26e6ebfa04aec0 (patch) | |
| tree | 683456288b33f05bcbfac8b63e0b796772324d63 | |
| parent | b5e59140cbc69a0b5cf70669e01affe1f1b201ed (diff) | |
| download | vcpkg-3d82def504f2cdf999e568bfdd26e6ebfa04aec0.tar.gz vcpkg-3d82def504f2cdf999e568bfdd26e6ebfa04aec0.zip | |
[ffmpeg] Fix build static error (#10368)
* [ffmpeg] Fix build static error
* Remove additional condition
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 769995497..9b08398db 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,5 +1,5 @@ Source: ffmpeg -Version: 4.2-5 +Version: 4.2-6 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/portfile.cmake b/ports/ffmpeg/portfile.cmake index 7adee3a8b..b1ddd0ddf 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ffmpeg/ffmpeg @@ -258,6 +256,10 @@ if(FILES_TO_REMOVE_LEN GREATER 0) endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) +endif() + vcpkg_copy_pdbs() # Handle copyright |