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

This commit is contained in:
Alexander Karatarakis 2017-03-15 12:30:06 -07:00
parent 2c33e512ff
commit f6d0cfe7c4

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)
@ -31,11 +36,6 @@ vcpkg_execute_required_process(
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)
@ -72,6 +72,10 @@ 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