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

Port vtk #973

Merged
merged 4 commits into from
Jun 24, 2022
Merged

Port vtk #973

merged 4 commits into from
Jun 24, 2022

Conversation

cryos
Copy link
Member

@cryos cryos commented Jun 24, 2022

Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.

Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
have the right to submit it under the open source license
indicated in the file; or

(b) The contribution is based upon previous work that, to the best
of my knowledge, is covered under an appropriate open source
license and I have the right under that license to submit that
work with modifications, whether created in whole or in part
by me, under the same open source license (unless I am
permitted to submit under a different license), as indicated
in the file; or

(c) The contribution was provided directly to me by some other
person who certified (a), (b) or (c) and I have not modified
it.

(d) I understand and agree that this project and the contribution
are public and that a record of the contribution (including all
personal information I submit with it, including my sign-off) is
maintained indefinitely and may be redistributed consistent with
this project or the open source license(s) involved.

cryos added 4 commits June 24, 2022 11:55
This change adapts to the numerous VTK CMake interface changes where the
components do not include 'vtk' any longer, but the targets are now
namespaced under 'VTK::' and the include directories/compile defintions
have been moved into target propoerties now. This was tested against VTK
master (4b551479) today and worked as expected on a clean build.

Signed-off-by: Marcus D. Hanwell <mhanwell@bnl.gov>
The QVTKOpenGLWidget is now the QVTKOpenGLStereoWidget, we don't need
stereo, but this fits the bill as far as I can see. The new class also
changes several methods to be Qt style signatures - adapt for that.

Signed-off-by: Marcus D. Hanwell <mhanwell@bnl.gov>
This adapts to the class name change and the new style signatures in
VTK's Qt-based rendering widget.

Signed-off-by: Marcus D. Hanwell <mhanwell@bnl.gov>
This adapts to the changes made in the VTK 9 API including the class
name change that impacted this plugin code.

Signed-off-by: Marcus D. Hanwell <mhanwell@bnl.gov>
@github-actions
Copy link
Contributor

Here are the build results
macOS-arm64.dmg
Artifacts will only be retained for 90 days.

@ghutchis ghutchis linked an issue Jun 24, 2022 that may be closed by this pull request
@ghutchis ghutchis added the build label Jun 24, 2022
@ghutchis
Copy link
Member

ghutchis commented Jun 24, 2022

Presumably, we also need to bump thirdparty in https://github.com/openchemistry/openchemistry correct?

Nevermind, just saw OpenChemistry/openchemistry#94

@ghutchis ghutchis merged commit 8080104 into OpenChemistry:master Jun 24, 2022
@github-actions
Copy link
Contributor

Here are the build results
Avogadro2.AppImage
Ubuntu-2004.tar.gz
Artifacts will only be retained for 90 days.

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

Successfully merging this pull request may close these issues.

does not build against VTK-9
2 participants