Skip to content

Commit

Permalink
rapids cpm patches now support differences in white space. (rapidsai#515
Browse files Browse the repository at this point in the history
)

Sometimes projects trim trailing whitespace from diffs, which causes them to not match the source. This allows us to handle those diff files

Authors:
  - Robert Maynard (https://github.com/robertmaynard)

Approvers:
  - Bradley Dice (https://github.com/bdice)

URL: rapidsai#515
  • Loading branch information
robertmaynard authored Jan 9, 2024
1 parent bbb3910 commit 66816a1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion rapids-cmake/cpm/patches/command_template.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function(rapids_cpm_run_git_patch file issue)
set(result 1)
if(ext STREQUAL "diff")
execute_process(
COMMAND ${git_command} apply ${file}
COMMAND ${git_command} apply --whitespace=fix ${file}
RESULT_VARIABLE result
ERROR_VARIABLE repo_error_info
)
Expand Down

0 comments on commit 66816a1

Please sign in to comment.