Commit 4f325b86 authored by Dekker's avatar Dekker
Browse files

COMP: Added --whitespace=fix to fix in CUSTOMBUILD error "patch does not apply" in Visual Studio:

1>------ Build started: Project: ITK, Configuration: Debug x64 ------
1>  Performing patch step for 'ITK'
1>  .../SuperBuild/Patches/itk_png_mangle_get_uint_31.patch:8: trailing whitespace.
1>  nm lib/libitkpng-4.10.a 2> /dev/null | grep " T \| D \| R " |
1>  .../SuperBuild/Patches/itk_png_mangle_get_uint_31.patch:16: trailing whitespace.
1>  #define png_get_uint_31 itk_png_get_uint_31
1>CUSTOMBUILD : error : patch failed: Modules/ThirdParty/PNG/src/itkpng/itk_png_mangle.h:10
1>CUSTOMBUILD : error : Modules/ThirdParty/PNG/src/itkpng/itk_png_mangle.h: patch does not apply
parent abb09272
......@@ -25,7 +25,7 @@ ExternalProject_Add( ${proj}
GIT_REPOSITORY ${ITK_REPOSITORY}
GIT_TAG ${ITK_TAG}
UPDATE_COMMAND ""
PATCH_COMMAND "${GIT_EXECUTABLE}" apply "${CMAKE_SOURCE_DIR}/Patches/itk_png_mangle_get_uint_31.patch"
PATCH_COMMAND "${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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment