Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix separate make and install execution error issue. #8540

Merged
merged 3 commits into from Oct 22, 2019
Merged

Fix separate make and install execution error issue. #8540

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23306a1
Fix separate make and install execution error issue.
Oct 10, 2019
6050d48
trigger CI system.
Oct 10, 2019
97f44ed
Fix multiple copy files under debug, fix separator between make and i…
Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/x264/CONTROL
View file
Open in desktop
@@ -1,4 +1,4 @@
Source: x264
Version: 157-303c484ec828ed0-4
Version: 157-303c484ec828ed0-5
Homepage: https://github.com/mirror/x264
Description: x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format
10 changes: 5 additions & 5 deletions scripts/cmake/vcpkg_build_make.cmake
View file
Open in desktop
Expand Up @@ -52,10 +52,10 @@ function(vcpkg_build_make)
set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;${PERL_EXE_PATH}")
set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
# Set make command and install command
set(MAKE ${BASH} --noprofile --norc -c "${_VCPKG_PROJECT_SUBPATH}make")
set(MAKE ${BASH} --noprofile --norc -c ${_VCPKG_PROJECT_SUBPATH}make)
JackBoosY marked this conversation as resolved.
Show resolved Hide resolved
# Must use absolute path to call make in windows
set(MAKE_OPTS "-j ${VCPKG_CONCURRENCY}")
set(INSTALL_OPTS "install -j ${VCPKG_CONCURRENCY}")
set(MAKE_OPTS -j ${VCPKG_CONCURRENCY})
set(INSTALL_OPTS install -j ${VCPKG_CONCURRENCY})
else()
# Compiler requriements
find_program(MAKE make REQUIRED)
Expand Down Expand Up @@ -121,7 +121,7 @@ function(vcpkg_build_make)
endif()

vcpkg_execute_build_process(
COMMAND ${MAKE} ${MAKE_OPTS}
COMMAND "${MAKE} ${MAKE_OPTS}"
WORKING_DIRECTORY ${WORKING_DIRECTORY}
LOGNAME "${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}"
)
Expand Down Expand Up @@ -158,7 +158,7 @@ function(vcpkg_build_make)

message(STATUS "Installing ${TARGET_TRIPLET}${SHORT_BUILDTYPE}")
vcpkg_execute_required_process(
COMMAND ${MAKE} ${INSTALL_OPTS}
COMMAND "${MAKE} ${INSTALL_OPTS}"
WORKING_DIRECTORY ${WORKING_DIRECTORY}
LOGNAME "install-${TARGET_TRIPLET}${SHORT_BUILDTYPE}"
)
Expand Down