diff options
| author | Leonid Pospelov <pospelovlm@yandex.ru> | 2020-02-28 00:22:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-27 14:22:16 -0800 |
| commit | 81965f6b3f7e99c3018f914cb8a15c2c02adcd4c (patch) | |
| tree | 9fd248c2f4828b9057baec60f9cea1dbab86a40d /scripts/cmake | |
| parent | 4f46ab90fc8edd6214480992690bc3994a744e17 (diff) | |
| download | vcpkg-81965f6b3f7e99c3018f914cb8a15c2c02adcd4c.tar.gz vcpkg-81965f6b3f7e99c3018f914cb8a15c2c02adcd4c.zip | |
[vcpkg] Better vcpkg_apply_patches error message (#10127)
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_apply_patches.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake index d1dba0396..9088def1b 100644 --- a/scripts/cmake/vcpkg_apply_patches.cmake +++ b/scripts/cmake/vcpkg_apply_patches.cmake @@ -41,13 +41,14 @@ function(vcpkg_apply_patches) _execute_process( COMMAND ${GIT} --work-tree=. --git-dir=.git apply "${ABSOLUTE_PATCH}" --ignore-whitespace --whitespace=nowarn --verbose OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-out.log - ERROR_FILE ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-err.log + ERROR_VARIABLE error WORKING_DIRECTORY ${_ap_SOURCE_PATH} RESULT_VARIABLE error_code ) + file(WRITE "${CURRENT_BUILDTREES_DIR}/${LOGNAME}-err.log" "${error}") if(error_code AND NOT _ap_QUIET) - message(FATAL_ERROR "Applying patch failed. Patch needs to be updated to work with source being used by vcpkg!") + message(FATAL_ERROR "Applying patch failed. ${error}") endif() math(EXPR PATCHNUM "${PATCHNUM}+1") |