diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-02 08:26:39 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-03-02 08:26:39 -0800 |
| commit | 782fa3000b42fafc5ed96adbeaa5295b1fb776db (patch) | |
| tree | 7b94dbf7efd7823f3b8149584244a6121135d851 | |
| parent | 2f8d8d8b18f8a6dd7dad6e3290074dc6044395ce (diff) | |
| download | vcpkg-782fa3000b42fafc5ed96adbeaa5295b1fb776db.tar.gz vcpkg-782fa3000b42fafc5ed96adbeaa5295b1fb776db.zip | |
[ffmpeg] Hotfix accounting for new flags
| -rw-r--r-- | ports/ffmpeg/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ports/ffmpeg/CONTROL b/ports/ffmpeg/CONTROL index 30d957b6c..d1db97c20 100644 --- a/ports/ffmpeg/CONTROL +++ b/ports/ffmpeg/CONTROL @@ -1,4 +1,4 @@ Source: ffmpeg -Version: 3.2.4 +Version: 3.2.4-1 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.
\ No newline at end of file diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 4bd8ea4bc..b9d795b20 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -85,8 +85,11 @@ endforeach() file(GLOB EXP_FILES ${CURRENT_PACKAGES_DIR}/lib/*.exp ${CURRENT_PACKAGES_DIR}/debug/lib/*.exp) file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - -file(REMOVE ${EXP_FILES} ${LIB_FILES} ${DEF_FILES} ${EXE_FILES}) +set(FILES_TO_REMOVE ${EXP_FILES} ${LIB_FILES} ${DEF_FILES} ${EXE_FILES}) +list(LENGTH FILES_TO_REMOVE FILES_TO_REMOVE_LEN) +if(FILES_TO_REMOVE_LEN GREATER 0) + file(REMOVE ${FILES_TO_REMOVE}) +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) vcpkg_copy_pdbs() |