-
Notifications
You must be signed in to change notification settings - Fork 2.7k
added, check and use Components in cmake #1137
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
Conversation
|
@Vollstrecker Please check conflicts. |
d574b1b to
ea8111e
Compare
ea8111e to
4185c6b
Compare
|
Should be done now. I also added the checks for the contribs, mainly to always see if they could be split into a separate repo to not get another CVE regarding them. |
|
Thanks! Though it still says there are conflicts. |
|
Srange, I rebased my develop fork and rebased that one here on that, but all I see "All checks have passed" and "No conflicts with base branch", so it also doesn't offer me anything to solve. If you tell me your workflow, I could try to reproduce it, I reviewed all the changes and they shouldn't affect any other parts, so it should be safe for you to just copy the CHANGED files over and do some kind of manual squash merge. |
|
I'm just looking at this page right here. It says: "This branch cannot be rebased due to conflicts". (I also see "All checks have passed".) |
|
These do indeed fail to apply when I do them all at once. I will do them one at a time, and try to resolve the conflicts. |
|
Ok, I was able to apply 15 out of 17 commits. They have been pushed here on develop. I think the easiest thing now would be for you to use your source files state as compared to develop, and make a new pull request to take it the rest of the way there. Thanks. |
The latest develop branch currently solves my problem. Thanks. |


Now components are done as expected and used in minizip and all tests.
For examples test/.cmake.in and contrib/minizip/test/.cmake.in are designed to show the different combinations and tests for these combinations are also added.
Superseeds #1113
@zero-rp: I guess this solves your problem.