diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-01-14 23:51:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-14 14:51:36 -0800 |
| commit | 6f593eb61e1c8d9b675887f2451374ca89acaa60 (patch) | |
| tree | 180b71cdf25dff1e94c971450835d36a119b3837 /scripts | |
| parent | eb6655cac53223a89985909dcda05ccde219d973 (diff) | |
| download | vcpkg-6f593eb61e1c8d9b675887f2451374ca89acaa60.tar.gz vcpkg-6f593eb61e1c8d9b675887f2451374ca89acaa60.zip | |
don't change line endings on patching. (#15578)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_apply_patches.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_apply_patches.cmake b/scripts/cmake/vcpkg_apply_patches.cmake index a3b6a46ee..b2e226351 100644 --- a/scripts/cmake/vcpkg_apply_patches.cmake +++ b/scripts/cmake/vcpkg_apply_patches.cmake @@ -51,7 +51,7 @@ function(vcpkg_apply_patches) message(STATUS "Applying patch ${PATCH}") set(LOGNAME patch-${TARGET_TRIPLET}-${PATCHNUM}) vcpkg_execute_in_download_mode( - COMMAND ${GIT} -c core.longpaths=true --work-tree=. --git-dir=.git apply "${ABSOLUTE_PATCH}" --ignore-whitespace --whitespace=nowarn --verbose + COMMAND ${GIT} -c core.longpaths=true -c core.autocrlf=false --work-tree=. --git-dir=.git apply "${ABSOLUTE_PATCH}" --ignore-whitespace --whitespace=nowarn --verbose OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/${LOGNAME}-out.log ERROR_VARIABLE error WORKING_DIRECTORY ${_ap_SOURCE_PATH} |