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/x264 | |
| 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/x264')
| -rw-r--r-- | ports/x264/portfile.cmake | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake index a6115f8d1..b9dbfa34d 100644 --- a/ports/x264/portfile.cmake +++ b/ports/x264/portfile.cmake @@ -11,18 +11,13 @@ vcpkg_from_github( ) # Acquire tools -vcpkg_acquire_msys(MSYS_ROOT) +vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15) # Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe". string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}") set(ENV{PATH} "${NEWPATH}") set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) -vcpkg_execute_required_process( - COMMAND ${BASH} --noprofile --norc -c "pacman -Sy --noconfirm --needed make automake1.15" - WORKING_DIRECTORY "${MSYS_ROOT}" - LOGNAME "pacman-${TARGET_TRIPLET}") - set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15) #file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source) |