Skip to content

Commit

Permalink
don't change line endings on patching. (#15578)
Browse files Browse the repository at this point in the history
  • Loading branch information
Neumann-A authored Jan 14, 2021
1 parent eb6655c commit 6f593eb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion scripts/cmake/vcpkg_apply_patches.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit 6f593eb

Please sign in to comment.