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

Update OCCT and pythonocc to 7.6.2 #32

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Update OCCT and pythonocc to 7.6.2 #32

merged 1 commit into from
Jan 2, 2024

Conversation

joergbrech
Copy link
Collaborator

Closes #31

@joergbrech joergbrech marked this pull request as ready for review December 12, 2023 21:02
@AntonReiswich
Copy link
Collaborator

The last action required here is the conflict. I assume in both conflicts the number 0 is to keep.

@joergbrech
Copy link
Collaborator Author

Please merge this after #35

@joergbrech joergbrech force-pushed the occt-7.6.2 branch 2 times, most recently from e7f1028 to a8c7180 Compare December 23, 2023 22:57
@joergbrech joergbrech marked this pull request as draft December 23, 2023 23:01
@joergbrech joergbrech force-pushed the occt-7.6.2 branch 3 times, most recently from 5984649 to 9fce7c3 Compare January 2, 2024 08:55
@joergbrech joergbrech marked this pull request as ready for review January 2, 2024 11:42
@joergbrech
Copy link
Collaborator Author

joergbrech commented Jan 2, 2024

@AntonReiswich This is ready for review again. Note that I had an issue after the merge of #35:

  • The github runner image ubuntu-20.04 comes with swig 4.0.1 pre-installed, while ubunut-22.04 has swig 4.0.2 pre-installed, see the readmes here.
  • building pythonocc now requires swig>=4.0.2. This requirement is added to the meta.yml file and conda-build installs the correct swig version into a dedicated build environment.
  • For some reason, the system-wide installation /usr/bin/swig4.0 gets picked up by cmake during the conda-build command instead of the one from the decicated build environment. This wasn't an issue on ubuntu-22.04, where the correct version was installed, but it is on ubuntu-20.04: Cmake complains that it finds an unsuitable swig version, ignoring the one from the conda-build build environment.
  • As a workaround I just sudo rm /usr/bin/swig4.0 on ubuntu-20.04 as part of the CI.

PS: Sorry for force-pushing, but I needed to have both opencascade and pythonocc altered as part of the last commit so that the python script builds both packages in CI

+++ opencascade-7.6.2/adm/cmake/occt_toolkit.cmake
@@ -400,7 +400,7 @@
if(IS_VTK_9XX)
string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hm, I don't understand what this conditional and this line is for??

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I didn't write this patch manually, but created it using git diff. The patch file contains the lines preceeding the actually modified lines, which are given in line 9 and 10 below. The patch makes sure that transient dependencies are linked privately.

So this conditional wasn't written by me, but is part of opencascade.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I see, thank you!

@AntonReiswich AntonReiswich merged commit 3f2655d into master Jan 2, 2024
24 checks passed
@AntonReiswich AntonReiswich deleted the occt-7.6.2 branch January 2, 2024 16:22
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.

Update pythonocc to 7.6.2
2 participants