From 0ae1c907970312c71f81c8656e3023772078ccba Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Fri, 29 Mar 2019 09:31:39 +0100 Subject: [PATCH] --ignore-whitespace in patch Fixes #565 --- win/build-deps.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win/build-deps.cmd b/win/build-deps.cmd index afc47cb8f5..b691332345 100644 --- a/win/build-deps.cmd +++ b/win/build-deps.cmd @@ -290,7 +290,7 @@ if not %ERRORLEVEL%==0 goto :Error findstr IfcOpenShell "%DEPENDENCY_DIR%\CMakeLists.txt">NUL if not %ERRORLEVEL%==0 ( pushd "%DEPENDENCY_DIR%" - git apply ""%~dp0patches\%OCCT_VER%.patch" + git apply --ignore-whitespace ""%~dp0patches\%OCCT_VER%.patch" popd ) findstr IfcOpenShell "%DEPENDENCY_DIR%\CMakeLists.txt">NUL