зеркало из https://github.com/microsoft/vcpkg.git
[vcpkg-apply-patches] Correct issue with src directories which contain a config\ folder. Reduce verbosity of output.
This commit is contained in:
Родитель
05369e9e26
Коммит
d7ff71610b
|
@ -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")
|
||||
|
|
Загрузка…
Ссылка в новой задаче