COMP: Added git reset, before applying patch, to fix another error, "patch...

COMP: Added git reset, before applying patch, to fix another error, "patch does not apply". W/ Floris.

COMP: Added git reset, before applying patch, to fix another error, "patch...
COMP: Added git reset, before applying patch, to fix another error, "patch does not apply". W/ Floris.
6c474568 · Dekker · 4f325b86 · 6c474568
Commit 6c474568 authored Apr 20, 2017 by Dekker
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

SuperBuild/ExternalITK.cmake SuperBuild/ExternalITK.cmake +1 -1

No files found.
--- a/SuperBuild/ExternalITK.cmake
+++ b/SuperBuild/ExternalITK.cmake
@@ -25,7 +25,7 @@ ExternalProject_Add( ${proj}
  GIT_REPOSITORY ${ITK_REPOSITORY}
  GIT_TAG ${ITK_TAG}
  UPDATE_COMMAND ""
-  PATCH_COMMAND "${GIT_EXECUTABLE}" apply --whitespace=fix "${CMAKE_SOURCE_DIR}/Patches/itk_png_mangle_get_uint_31.patch"
+  PATCH_COMMAND "${GIT_EXECUTABLE}" reset --hard && "${GIT_EXECUTABLE}" apply --whitespace=fix "${CMAKE_SOURCE_DIR}/Patches/itk_png_mangle_get_uint_31.patch"
  SOURCE_DIR ${proj}
  BINARY_DIR ${proj}-build
  CMAKE_ARGS