Cura 8640 PyQt6 upgrade #41
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This ports the CMake build logic. It won't compile yet because We also need to change some code in the sip definition files. Contributes to CURA-7924
A convenience function which outputs a compile_commands.json showing the used compile commands. Helpful for CMake debugging. Contributes to CURA-7924
Co-authored-by: rburema <r.burema@ultimaker.com> Sip 6.5.0 uses different methods and types. Contributes to CURA-7924
- Set SIP_BUILD_EXECUTABLE from Script - Set extension of module depending on OS Contributes to CURA-7924
Cura 7924 sip cmake build
These CMake functions ensure that properties such as rpaths and threading etc are set correctly. Contributes to CURA-8640
Although not needed at run-time, it is needed for freeze time, such that cx-freeze can find it. Contributes to CURA-8640
Contributes to CURA-8640
../lib is an symlink to ../Resources/lib/ Contributes to CURA-8640
Contributes to CURA-8640
Otherwise, fall back to FindPython. Contributes to issue CURA-8640.
Contributes to issue CURA-8640.
Contributes to CURA-8640
Contributes to CURA-8640
Don't rebuild when installing Contributes to CURA-8640
Contributes to CURA-8640
Contributes to CURA-8640
This should already be taken care of by target_include_dir Contributes to CURA-8640
Already handled by the use_threads function Contributes to CURA-8640
Contributes to CURA-8640
2 tasks
Closed
1 task
This was referenced Apr 12, 2022
This was referenced Apr 12, 2022
Ghostkeeper
suggested changes
Apr 13, 2022
This reverts commit 1dede18.
Contributes to CURA-8640
BUILD_SHARED_LIBS is a global CMake option, while BUILD_STATIC our own custom option. Contributes to CURA-8640
Contributes to CURA-8640
Already done by the StandardProjectSettings.cmake Contributes to CURA-8640
Added comment Contributes to CURA-8640
added 3 commits
April 14, 2022 11:45
Contributes to CURA-8640
Contributes to CURA-8640
Contributes to CURA-8640
Ghostkeeper
approved these changes
Apr 14, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Because we are switching to Qt6 we also needed to update SIP to 5.0+
SIP5+ builds en generate the code using a new process and executable. We had a lot of trouble linking the sip generated binaries on all three systems using the QGIS CMake Macro's so we decided to let sip only generate the C++ source code from the sip files and leave compiling and linking in the CMake domain. This is achieved by using our own CMakebuilder.py which is then used by sip-build instead of its shipped builder. This Cmakebuilder is basically the same in every respect except the call to the build function has been removed.
Make sure that sip-build is installed and that it is added to the PYTHONPATH
In order to get this to work on our build-system and working for all three OSes we did a shit tons of boy scouting in our cmake. We removed old methods with variables and try to be consisted in a target-based approach. The idea is that we don't patch stuff down the line, but that the install should place everything with desired rpaths for each project.
There were also some changes needed in the namespace when using enums and the created Python module is called pySavitar. This was needed to ensure no naming conflicts downstream.
Part of
Fixes
Todo