-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
[vtk] fix find lz4 hdf5 pegl #15521
[vtk] fix find lz4 hdf5 pegl #15521
Conversation
983b362
to
8d7f6bc
Compare
48c7c8e
to
9f90402
Compare
Please ping me if this PR is ready for review. |
unfortunately not yet. I didn't manage to fix correctly the initial problem (hdf5 double inclusion when using VTK + ITK) |
For users who only use vtk, do you have any way to deal with this problem? I tried your changes, for the modification of lz4, the compilation did not report an error, but for hdf5 pegl did not seem to solve the problem. |
Well, I removed the hdf5 patch as it breaks VTK build (as you noticed). I've tried many things with no acceptable solutions. I'm trying to remove the FindHDF5.cmake after build as a workaround for now... If any of you have an idea, I'm taking it. |
I didn't manage to fix the issue with hdf5. So I propose this workaround (simply removing FindHDF5.cmake after build from VTK and use the regular config from HDF5 directly), which seems to be effective for us. If anyone have a better solution, I'll take it. |
Since you've closed the modify permission of other mantainers, please do the following steps:
|
@dweckmann Thank you very much for your contribution! During the test, a problem was found. For other libraries, there is no problem with repeated search: For the VTK library, an error message will be reported for repeated searches:
Do you have any suggestions for this situation? If finding the library twice is indeed abnormal behavior, I will try to adjust the project logic to solve it. |
f62f36d
to
84eadab
Compare
No sorry, VTK cmake files are too complex for my basic knowledge about it. I've tried to tweak a bit this part, but either my project won't build, either VTK won't. |
All find modules should have a check |
e722fb2
to
6266124
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please bump the port version. See documentation.
And do the following steps:
- Revert changes a bout
port_versions/v-/vtk.json
- Rerun command
./vcpkg x-add-version vtk
- Update changes
d1153fc
to
4922629
Compare
Same for this one, you'll have to rebase on upstream/master. |
a7f3589
to
d97e800
Compare
LGTM, @Neumann-A do you have any other questions? |
de5fa33
to
1cf88f8
Compare
1cf88f8
to
3fc3f01
Compare
3fc3f01
to
d249393
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to:
- Merge with origin/master. Take master's versions/v-/vtk.json
- Bump Port-Version in ports/vtk/CONTROL
- Commit that
vcpkg x-add-version vtk
- Commit that
I tried to do this for you but you didn't allow maintainer edits when creating the pr.
versions/v-/vtk.json
Outdated
{ | ||
"versions": [ | ||
{ | ||
"git-tree": "88d95daae73bf5c3413bb18188c81f9ea752e418", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to not damage the existing versions database.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should be good now. Thanks for your time !
d249393
to
9b60e12
Compare
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
(Rerunning due to replacing the macos vms) |
Please add add
|
@JackBoosY: Why? This looks like the same issue marble had in another PR. Maybe there is some issue with the newer CMake version? |
@Neumann-A So can you make a new PR to fix that? |
Can you please merge to master? |
Ping @dweckmann for response. |
Sorry, I don't have time to spend on this anymore as we are focused on other subjects right now. I really wish I could help further, but I cannot make any promise, sorry again. Feel free to close the PR or re-author it. |
Okay, please continue your PR in any time. |
If you want to continue this PR, please reopen. |
@dweckmann Is still work for this PR? Please reply me |
@FrankXie05 The last time I checked, only the patch for lz4 in VTK is still relevant. I guess you have to strip all other patches and only keep that. Feel free to take this pr as basis and reopen. |
@dweckmann Thanks for your reply, I will submit a PR to verify it. :) |
Describe the pull request
Basically it fixes LZ4, HDF5, PEGL import problems, allowing to use VTK / ITK with FindPackage.