Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[vcpkg_apply_patches] Improve error message from failed patch apply.

This commit is contained in:
Robert Schumacher 2016-10-24 21:13:30 -07:00
parent 878b65e6b9
commit dffedfaa32
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/cmake/vcpkg_apply_patches.cmake
View File

@ -16,11 +16,10 @@ function(vcpkg_apply_patches)
if(error_code) if(error_code)
message(STATUS message(STATUS
"Applying patch failed: ${GIT} --work-tree=. apply \"${PATCH}\" --ignore-whitespace --whitespace=nowarn --verbose\n" "Applying patch failed: ${GIT} --work-tree=. --git-dir=. apply \"${PATCH}\" --ignore-whitespace --whitespace=nowarn --verbose\n"
"Working Directory: ${_ap_SOURCE_PATH}\n" "-- Working Directory: ${_ap_SOURCE_PATH}\n"
"See logs for more information:\n" "-- This is expected if this patch was previously applied.\n"
" ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-out.log\n" "-- See logs for more information: ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-out.log ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-err.log")
" ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-err.log\n")
endif() endif()
message(STATUS "Applying patch ${PATCH} done") message(STATUS "Applying patch ${PATCH} done")