--ignore-whitespace in patch Fixes IfcOpenShell#565

aothms · aothms · commit 0ae1c9079703 · 2019-03-29T09:31:39.000+01:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ if not %ERRORLEVEL%==0 goto :Error`
`290`	`290`	`findstr IfcOpenShell "%DEPENDENCY_DIR%\CMakeLists.txt">NUL`
`291`	`291`	`if not %ERRORLEVEL%==0 (`
`292`	`292`	`pushd "%DEPENDENCY_DIR%"`
`293`		`- git apply ""%~dp0patches\%OCCT_VER%.patch"`
	`293`	`+ git apply --ignore-whitespace ""%~dp0patches\%OCCT_VER%.patch"`
`294`	`294`	`popd`
`295`	`295`	`)`
`296`	`296`	`findstr IfcOpenShell "%DEPENDENCY_DIR%\CMakeLists.txt">NUL`