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/ffmpeg | |
| 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/ffmpeg')
| -rw-r--r-- | ports/ffmpeg/build.sh | 1 | ||||
| -rw-r--r-- | ports/ffmpeg/portfile.cmake | 14 |
2 files changed, 5 insertions, 10 deletions
diff --git a/ports/ffmpeg/build.sh b/ports/ffmpeg/build.sh index eea05c959..048d9ec08 100644 --- a/ports/ffmpeg/build.sh +++ b/ports/ffmpeg/build.sh @@ -8,7 +8,6 @@ fi if [ "$HTTPS_PROXY" ]; then export https_proxy=$HTTPS_PROXY fi -pacman -Sy --noconfirm --needed diffutils make PATH_TO_BUILD_DIR="`cygpath "$1"`" PATH_TO_SRC_DIR="`cygpath "$2"`" diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index 9e969bf6c..56b467685 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -17,7 +17,11 @@ vcpkg_find_acquire_program(YASM) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}") -vcpkg_acquire_msys(MSYS_ROOT) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") + vcpkg_acquire_msys(MSYS_ROOT PACKAGES perl gcc diffutils make) +else() + vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils make) +endif() set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;$ENV{LIB}") @@ -45,14 +49,6 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") get_filename_component(GAS_ITEM_PATH ${GAS_PATH} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${GAS_ITEM_PATH}") endforeach(GAS_PATH) - - ## Get Perl and GCC for MSYS2 - vcpkg_execute_required_process( - COMMAND ${BASH} --noprofile --norc -c 'PATH=/usr/bin:\$PATH;pacman -Sy --noconfirm --needed perl gcc' - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME msys-${TARGET_TRIPLET} - ) - elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") elseif (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") else() |