diff options
| author | b-r-o-c-k <brockmammen@gmail.com> | 2018-03-17 16:20:14 -0500 |
|---|---|---|
| committer | b-r-o-c-k <brockmammen@gmail.com> | 2018-03-18 12:50:39 -0500 |
| commit | bf789b04f3d8b06f836aab384f3dee39b0188df6 (patch) | |
| tree | 332dfd986e3e5f91c8003cddfdeb8bd7e70ffe21 | |
| parent | 4e02f1ab871f30d80250537877924d522497493b (diff) | |
| download | rneovim-bf789b04f3d8b06f836aab384f3dee39b0188df6.tar.gz rneovim-bf789b04f3d8b06f836aab384f3dee39b0188df6.tar.bz2 rneovim-bf789b04f3d8b06f836aab384f3dee39b0188df6.zip | |
build/windows: Ignore whitespace when applying patches
The --ignore-whitespace argument was added when applying patches to
prevent failures when patched files have different line endings.
| -rw-r--r-- | third-party/cmake/BuildLibvterm.cmake | 2 | ||||
| -rw-r--r-- | third-party/cmake/BuildLuarocks.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third-party/cmake/BuildLibvterm.cmake b/third-party/cmake/BuildLibvterm.cmake index 73e2990654..f37fca56dd 100644 --- a/third-party/cmake/BuildLibvterm.cmake +++ b/third-party/cmake/BuildLibvterm.cmake @@ -38,7 +38,7 @@ if(WIN32) if(MSVC) set(LIBVTERM_PATCH_COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/libvterm init - COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/libvterm apply + COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/libvterm apply --ignore-whitespace ${CMAKE_CURRENT_SOURCE_DIR}/patches/libvterm-Remove-VLAs-for-MSVC.patch) endif() set(LIBVTERM_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E copy diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake index f9960495fc..b5fcf7f3e5 100644 --- a/third-party/cmake/BuildLuarocks.cmake +++ b/third-party/cmake/BuildLuarocks.cmake @@ -85,7 +85,7 @@ elseif(MSVC OR MINGW) BuildLuarocks( PATCH_COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/luarocks init - COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/luarocks apply + COMMAND ${GIT_EXECUTABLE} -C ${DEPS_BUILD_DIR}/src/luarocks apply --ignore-whitespace ${CMAKE_CURRENT_SOURCE_DIR}/patches/luarocks-Change-default-downloader-to-curl.patch INSTALL_COMMAND install.bat /FORCECONFIG /NOREG /NOADMIN /Q /F /LUA ${DEPS_INSTALL_DIR} |