The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 11:07:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

[libvpx] Add git to the PATH before launching command that requires it

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-03-15 12:30:06 -07:00
parent 2c33e512ff
commit f6d0cfe7c4
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ports/libvpx/portfile.cmake
View File

@ -1,3 +1,8 @@
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
message(STATUS "Warning: Dynamic building not supported by libvpx yet. Building static.")
set(VCPKG_LIBRARY_LINKAGE static)
endif()
include(vcpkg_common_functions)
set(LIBVPX_VERSION 1.6.1)
@ -25,17 +30,12 @@ set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
message(STATUS "Installing MSYS Packages")
vcpkg_execute_required_process(
COMMAND
COMMAND
${BASH} --noprofile --norc -c
"pacman -Sy --noconfirm --needed make"
WORKING_DIRECTORY ${MSYS_ROOT}
LOGNAME pacman-${TARGET_TRIPLET})
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
message(STATUS "Warning: Dynamic building not supported by libvpx yet. Building static.")
set(VCPKG_LIBRARY_LINKAGE static)
endif()
file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
if(VCPKG_CRT_LINKAGE STREQUAL static)
@ -61,10 +61,10 @@ set(LIBVPX_TARGET_VS "vs14")
message(STATUS "Generating makefile")
file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
vcpkg_execute_required_process(
COMMAND
COMMAND
${BASH} --noprofile --norc
"${SOURCE_PATH_UNIX}/configure"
--target=${LIBVPX_TARGET_ARCH}-${LIBVPX_TARGET_VS}
--target=${LIBVPX_TARGET_ARCH}-${LIBVPX_TARGET_VS}
${LIBVPX_CRT_LINKAGE}
--disable-examples
--disable-tools
@ -72,9 +72,13 @@ vcpkg_execute_required_process(
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}"
LOGNAME configure-${TARGET_TRIPLET})
find_program(GIT git)
get_filename_component(GIT_EXE_PATH ${GIT} DIRECTORY)
set(ENV{PATH} "$ENV{PATH};${GIT_EXE_PATH}")
message(STATUS "Generating MSBuild projects")
vcpkg_execute_required_process(
COMMAND
COMMAND
${BASH} --noprofile --norc -c "make dist"
WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}"
LOGNAME generate-${TARGET_TRIPLET})
@ -97,9 +101,9 @@ else()
set(LIBVPX_INCLUDE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx-vp8-vp9-nodocs-${LIBVPX_TARGET_ARCH}${LIBVPX_CRT_SUFFIX}-${LIBVPX_TARGET_VS}-v${LIBVPX_VERSION}/include/vpx")
endif()
file(
INSTALL
INSTALL
${LIBVPX_INCLUDE_DIR}
DESTINATION
DESTINATION
"${CURRENT_PACKAGES_DIR}/include"
RENAME
"vpx")