-
Notifications
You must be signed in to change notification settings - Fork 3
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
Conversation
The last action required here is the conflict. I assume in both conflicts the number 0 is to keep. |
Please merge this after #35 |
e7f1028
to
a8c7180
Compare
5984649
to
9fce7c3
Compare
@AntonReiswich This is ready for review again. Note that I had an issue after the merge of #35:
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}") |
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.
Hm, I don't understand what this conditional and this line is for??
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.
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.
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.
I see, thank you!
Closes #31