diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-10-24 21:13:30 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-10-24 21:13:30 -0700 |
| commit | dffedfaa320a0e73f2f4e455d0ef8fba7e72d75c (patch) | |
| tree | f4c1065293416559046c9085a668da35497f7715 | |
| parent | 878b65e6b9cd1b7ec25289c7bfd942aea0d7f3f9 (diff) | |
| download | vcpkg-dffedfaa320a0e73f2f4e455d0ef8fba7e72d75c.tar.gz vcpkg-dffedfaa320a0e73f2f4e455d0ef8fba7e72d75c.zip | |
[vcpkg_apply_patches] Improve error message from failed patch apply.
| -rw-r--r-- | scripts/cmake/vcpkg_apply_patches.cmake | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake index 731909834..2ebf4266e 100644 --- a/scripts/cmake/vcpkg_apply_patches.cmake +++ b/scripts/cmake/vcpkg_apply_patches.cmake @@ -16,11 +16,10 @@ function(vcpkg_apply_patches) if(error_code) message(STATUS - "Applying patch failed: ${GIT} --work-tree=. apply \"${PATCH}\" --ignore-whitespace --whitespace=nowarn --verbose\n" - "Working Directory: ${_ap_SOURCE_PATH}\n" - "See logs for more information:\n" - " ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-out.log\n" - " ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-err.log\n") + "Applying patch failed: ${GIT} --work-tree=. --git-dir=. apply \"${PATCH}\" --ignore-whitespace --whitespace=nowarn --verbose\n" + "-- Working Directory: ${_ap_SOURCE_PATH}\n" + "-- This is expected if this patch was previously applied.\n" + "-- See logs for more information: ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-out.log ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-err.log") endif() message(STATUS "Applying patch ${PATCH} done") |