diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-07-08 04:58:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 13:58:29 -0700 |
| commit | 1658781750e012e3c3bcddc0c4567fc171fbdf0f (patch) | |
| tree | 9e7ecffca418151a431d8597f5e563b9665adb0c | |
| parent | c6dafe169a7079f255a5c8312d5438e68c6b8006 (diff) | |
| download | vcpkg-1658781750e012e3c3bcddc0c4567fc171fbdf0f.tar.gz vcpkg-1658781750e012e3c3bcddc0c4567fc171fbdf0f.zip | |
[ffmpeg] Fix tools dependency dll file (#12063)
* [ffmpeg] Fix tools dependency dll file
* [ffmpeg] Fix tools install path
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 727a96679..14eb4ae10 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -273,10 +273,12 @@ if (VCPKG_TARGET_IS_WINDOWS) if(FILES_TO_REMOVE) if (EXE_FILES_REL) - file(INSTALL ${EXE_FILES_REL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) + file(INSTALL ${EXE_FILES_REL} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT}) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) endif() if (EXE_FILES_DBG) - file(INSTALL ${EXE_FILES_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools) + file(INSTALL ${EXE_FILES_DBG} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}) + vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/debug/tools/${PORT}) endif() file(REMOVE ${FILES_TO_REMOVE}) endif() |