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

Cura 8640 PyQt6 upgrade #134

Merged
merged 66 commits into from
Apr 14, 2022
Merged
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
b86c38f
Only use sip to generate source files
Feb 23, 2022
02c7347
Find SIP on the system.
Feb 24, 2022
b6e681d
Added CMake function add_sip_module
Feb 24, 2022
ba6b5a6
Dressed down the pyproject.toml.in file some more
Feb 24, 2022
d16dc55
Renamed the main sip defintion file to reflect the module_name
Feb 24, 2022
3799ae7
Use the new CMake module add_sip_module
Feb 24, 2022
5316234
Link Arcus against protobuf target
jellespijker Feb 24, 2022
b3202a2
Use the CMAKE_SOURCE_DIR for including the SIPMacros
jellespijker Feb 24, 2022
8f71558
Add the current bin directory to the PYTHONPATH
jellespijker Feb 24, 2022
e173335
Make sure the extension is so on UNIX and pyd on Windows
jellespijker Feb 24, 2022
7c1edb3
Merge remote-tracking branch 'origin/CURA-7924_sip_cmake_build' into …
jellespijker Feb 24, 2022
4ba57f2
Use OS specific seperator for the PYTHONPATH
Feb 24, 2022
337d180
Setting the PYTHONPATH with the CMAKE_COMMAND
Feb 24, 2022
c61b68a
Changes needed for Windows compilation.
rburema Feb 24, 2022
5751f92
Nescesary for proper functioning .pyd on Windows.
rburema Feb 24, 2022
ea70846
This wasn't producng a proper dynamic library, not even on Windows.
rburema Feb 24, 2022
50bc179
Always include SIPMacros when find_package(SIP) is called
Feb 25, 2022
104968b
Moved CMakeBuilder to CMake build module location
Feb 25, 2022
12d420d
Added a install_sip_module to SIP CMake build module
Feb 25, 2022
b1325c9
Use the actual Python defined SO ABI extension
Feb 25, 2022
95a2a26
Make user cpp sources optional
Feb 25, 2022
287c7e5
If the sip build is not pre-set it should be here.
rburema Feb 25, 2022
ee282bd
Revert "Make user cpp sources optional"
rburema Feb 25, 2022
2aa1e48
Revert "Use the actual Python defined SO ABI extension"
rburema Feb 25, 2022
0c62785
Remove redundant sanitize_list macro
Feb 25, 2022
b991cc7
Sip 6 can handle enum class.
rburema Feb 25, 2022
83dffa4
Merge pull request #131 from Ultimaker/CURA-7924_sip_cmake_build
nallath Feb 28, 2022
1ffcc3d
Added StandardProjectSettings module
Mar 3, 2022
12fdb07
use arguments for function use_rpaths
Mar 4, 2022
cc167f1
escape dollar sign on ORIGIN rpath
Mar 4, 2022
de5ce6b
allways full RPATH
Mar 4, 2022
7376d78
set rpath for sip_<interface_target> target
Mar 4, 2022
805bcec
Revert "set rpath for sip_<interface_target> target"
jellespijker Mar 4, 2022
2deab5c
transfer rpath properties to sip_target
Mar 4, 2022
c34fbe4
Fixed setting of multiple paths
Mar 4, 2022
bdfc059
Added Linux AppImage paths
Mar 4, 2022
6014174
Sync SIPMAcros.cmake with Savitar
Mar 4, 2022
4dffd0c
Revert "Sync SIPMAcros.cmake with Savitar"
jellespijker Mar 4, 2022
12acc2d
Added relative rpath to lib from site-packages
jellespijker Mar 4, 2022
3c724a6
Also use relative rpath from loader
jellespijker Mar 8, 2022
58a94a0
Also add the ../Resources/lib/
Mar 8, 2022
659796e
Bumped up version and so version to 5
Mar 14, 2022
e6d6b6f
Allow usage of Conan
Mar 29, 2022
5d1d390
Set PYTHONPATH with cmake variable
Mar 31, 2022
053d794
Set PYTHONPATH with cmake variable
Apr 4, 2022
20dd9d0
Mimic find package variables Python
Apr 4, 2022
2f408d6
Also use PYTHONPATH when generating for the first time
Apr 4, 2022
26dbff7
Allow defining local site-package install path
Apr 5, 2022
766f634
Bump up minimum supported CMake version
jellespijker Apr 12, 2022
045fed6
Bump up minimum supported CMake version
jellespijker Apr 12, 2022
7350da2
Removed CPack support
jellespijker Apr 12, 2022
4ba8dda
Removed protobuf Module compatibility workaround
jellespijker Apr 12, 2022
2be1f55
Removed obsolete Export Header
jellespijker Apr 12, 2022
845b021
Revert "Removed obsolete Export Header"
jellespijker Apr 13, 2022
c8aed1b
Remove Example
jellespijker Apr 13, 2022
e583bb8
Review suggestion implemented
jellespijker Apr 13, 2022
9a89a3b
Remove obsolete jenkins file
jellespijker Apr 13, 2022
b42fae3
Add cmake-build to gitignore
jellespijker Apr 13, 2022
8504b4f
We don't use mingw anymore
jellespijker Apr 13, 2022
7373fbf
codestyle change on assure_out_of_source_builds
jellespijker Apr 13, 2022
6b1b7c2
Using BUILD_SHARED_LIBS flag instead of BUILD_STATIC
jellespijker Apr 13, 2022
24199a7
Remove CICD
jellespijker Apr 13, 2022
740514d
Fix wrong function call assure_out_of_source_builds
jellespijker Apr 14, 2022
55ac188
Use Python_VERSION for Cpython site-packages
Apr 14, 2022
6636816
Allow static build of the Python Module
Apr 14, 2022
a69cd0f
Allow in source builds
Apr 14, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
We don't use mingw anymore
Contributes to CURA-8640
jellespijker committed Apr 13, 2022
commit 8504b4fef8731dc27fee4db7cf5d1c90a1585157
58 changes: 0 additions & 58 deletions .github/workflows/cicd-mingw64.yml

This file was deleted.

27 changes: 0 additions & 27 deletions docker/build-deb-mingw64.sh

This file was deleted.

13 changes: 0 additions & 13 deletions docker/publish-debs.sh

This file was deleted.