Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Additional search path for patch.exe #581

Merged

Conversation

ScottBailey
Copy link
Contributor

It seems the windows installation locations of patch.exe and git.exe have either changed or are not fixed relative to one another (possibly based on install options?). Regardless, this change will search both the parent AND the parent-parent path for patch.exe.

Written to address #576.

@ScottBailey
Copy link
Contributor Author

@crackedmind Please review and test this change on your system. I am unable to test it on mine.

@crackedmind
Copy link

@ScottBailey it's working.

@ScottBailey
Copy link
Contributor Author

@TheLartians It looks like finding patch.exe is more dynamic than I initially thought. It changed! This PR makes it a bit better.

I had considered using a recursive file glob, but this is a much simpler change that will succeed or fail much faster. If the directory structure continues to change, we can revisit file glob.

Closes #576

Thank you for reporting @crackedmind

@TheLartians TheLartians linked an issue Aug 2, 2024 that may be closed by this pull request
Copy link
Member

@TheLartians TheLartians left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR @ScottBailey, looks like a pragmatic fix!
Also thanks @crackedmind for reporting and testing this.

@TheLartians TheLartians merged commit 0bc73f4 into cpm-cmake:master Aug 2, 2024
11 checks passed
@TheLartians
Copy link
Member

Fix is deployed in v0.40.2 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect find patch program under win32
3 participants