diff options
| author | Jacob Zhong <cmpute@qq.com> | 2018-02-24 16:00:51 +0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-24 00:00:51 -0800 |
| commit | 63901137f66ec90f4a51070bd53a2d7433b4b54a (patch) | |
| tree | e52b6c07eaa92c1ad2d21b7f62da9595a78f02e1 /ports/libvpx | |
| parent | c55ccbf146f6aeaba158f58614578906ae3f01ab (diff) | |
| download | vcpkg-63901137f66ec90f4a51070bd53a2d7433b4b54a.tar.gz vcpkg-63901137f66ec90f4a51070bd53a2d7433b4b54a.zip | |
Add doxygen and add packages option to vcpkg_require_msys (#2869)
* Add doxygen to acquired programs
* Add packages option to msys function
* Add documentation for PACKAGES in vcpkg_require_msys
* [ffmpeg][x264] Update to use `PACKAGES` parameter. Tweak docs.
Diffstat (limited to 'ports/libvpx')
| -rw-r--r-- | ports/libvpx/portfile.cmake | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index f7e36b5a8..31630332a 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -22,20 +22,12 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_find_acquire_program(YASM) vcpkg_find_acquire_program(PERL) -vcpkg_acquire_msys(MSYS_ROOT) +vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) set(ENV{PATH} "${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) -message(STATUS "Installing MSYS Packages") -vcpkg_execute_required_process( - COMMAND - ${BASH} --noprofile --norc -c - "pacman -Sy --noconfirm --needed make" - WORKING_DIRECTORY ${MSYS_ROOT} - LOGNAME pacman-${TARGET_TRIPLET}) - file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) if(VCPKG_CRT_LINKAGE STREQUAL static) |