[cmake] special git patch args for Windows#21930
Merged
linev merged 1 commit intoroot-project:masterfrom Apr 17, 2026
Merged
Conversation
bellenot
approved these changes
Apr 16, 2026
Member
Author
|
Looks like ninja does not like new args. |
linev
force-pushed
the
win_git_patch
branch
2 times, most recently
from
01c55c5 to
b58fe32
Compare
linev
force-pushed
the
win_git_patch
branch
2 times, most recently
from
ba4a485 to
9035b9a
Compare
On Windows line ending is different and therefore patch file
generated on Linux cannot be applied as is.
Add "--ignore-whitespace" arguments to git apply command on Windows
DO not use ${GIT_EXECUTABLE} cmake variable - alma10 has problem with it
linev
force-pushed
the
win_git_patch
branch
2 times, most recently
from
9035b9a to
bcb583c
Compare
Member
|
I don't understand why this is needed at all, I never had such issue on my machines... |
Member
Author
|
As we discuss - it is local settings of That is really strange - use of |
Test Results 22 files 22 suites 3d 3h 56m 14s ⏱️ Results for commit bcb583c. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On Windows line ending is different and therefore patch file generated on Linux cannot be applied as is.
Add "--ignore-whitespace" arguments to git apply command - but only for Windows, on alma flags are failing.
Use ${GIT_EXECUTABLE} cmake variable to be more precise when invoking git
Resolves compilation on Windows with
-Dbuiltin_gl2ps=ON, making similar changes in other builtinsSimilar args already used in
fitsiobuiltin