diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-11-02 16:49:15 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-11-02 16:49:15 -0700 |
| commit | d7ff71610b5eed96c86374ad0fb41857a49839cb (patch) | |
| tree | 14acdcad9ef9b983ad95cad5c1e2e8da19bbba37 /scripts/cmake | |
| parent | 05369e9e26bf08754fe3c22e6469983231470567 (diff) | |
| download | vcpkg-d7ff71610b5eed96c86374ad0fb41857a49839cb.tar.gz vcpkg-d7ff71610b5eed96c86374ad0fb41857a49839cb.zip | |
[vcpkg-apply-patches] Correct issue with src directories which contain a config\ folder. Reduce verbosity of output.
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_apply_patches.cmake | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake index 2ebf4266e..cd3026b6a 100644 --- a/scripts/cmake/vcpkg_apply_patches.cmake +++ b/scripts/cmake/vcpkg_apply_patches.cmake @@ -7,19 +7,15 @@ function(vcpkg_apply_patches) message(STATUS "Applying patch ${PATCH}") set(LOGNAME patch-${TARGET_TRIPLET}-${PATCHNUM}) execute_process( - COMMAND ${GIT} --work-tree=. --git-dir=. apply "${PATCH}" --ignore-whitespace --whitespace=nowarn --verbose + COMMAND ${GIT} --work-tree=. --git-dir=.git apply "${PATCH}" --ignore-whitespace --whitespace=nowarn --verbose OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-out.log ERROR_FILE ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-err.log WORKING_DIRECTORY ${_ap_SOURCE_PATH} RESULT_VARIABLE error_code ) - + if(error_code) - message(STATUS - "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") + message(STATUS "Applying patch failed. This is expected if this patch was previously applied.") endif() message(STATUS "Applying patch ${PATCH} done") |