Code

Cura 8640 PyQt6 upgrade#134

Code

Merged

Ghostkeeper merged 66 commits into5.0Ultimaker/libArcus:5.0from CURA-8640_PyQt6_upgradeUltimaker/libArcus:CURA-8640_PyQt6_upgradeCopy head branch name to clipboardApr 14, 2022

+758-843

Commits

Commits on Feb 23, 2022

• Only use sip to generate source files

  Show description for b86c38f
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  b86c38f

Commits on Feb 24, 2022

• Find SIP on the system.

  Show description for 02c7347
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  02c7347

• Added CMake function add_sip_module

  Show description for b6e681d
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  b6e681d

• Dressed down the pyproject.toml.in file some more

  Show description for ba6b5a6
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  ba6b5a6

• Renamed the main sip defintion file to reflect the module_name

  Show description for d16dc55
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  d16dc55

• Use the new CMake module add_sip_module

  Show description for 3799ae7
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  3799ae7

• Link Arcus against protobuf target

  Show description for 5316234
  jellespijker

  committed
  5316234

• Use the CMAKE_SOURCE_DIR for including the SIPMacros

  Show description for b3202a2
  jellespijker

  committed
  b3202a2

• Add the current bin directory to the PYTHONPATH

  Show description for 8f71558
  jellespijker

  committed
  8f71558

• Make sure the extension is so on UNIX and pyd on Windows

  Show description for e173335
  jellespijker

  committed
  e173335

• Merge remote-tracking branch 'origin/CURA-7924_sip_cmake_build' into CURA-7924_sip_cmake_build

  jellespijker

  committed
  7c1edb3

• Use OS specific seperator for the PYTHONPATH

  Show description for 4ba57f2
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  4ba57f2

• Setting the PYTHONPATH with the CMAKE_COMMAND

  Show description for 337d180
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  337d180

• Changes needed for Windows compilation.

  Show description for c61b68a
  rburema

  committed
  c61b68a

• Nescesary for proper functioning .pyd on Windows.

  Show description for 5751f92
  rburema

  committed
  5751f92

• This wasn't producng a proper dynamic library, not even on Windows.

  Show description for ea70846
  rburema

  committed
  ea70846

Commits on Feb 25, 2022

• Always include SIPMacros when find_package(SIP) is called

  Show description for 50bc179
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  50bc179

• Moved CMakeBuilder to CMake build module location

  Show description for 104968b
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  104968b

• Added a install_sip_module to SIP CMake build module

  Show description for 12d420d
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  12d420d

• Use the actual Python defined SO ABI extension

  Show description for b1325c9
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  b1325c9

• Make user cpp sources optional

  Show description for 95a2a26
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  95a2a26

• If the sip build is not pre-set it should be here.

  Show description for 287c7e5
  rburema

  committed
  287c7e5

• Revert "Make user cpp sources optional"

  Show description for ee282bd
  rburema

  committed
  ee282bd

• Revert "Use the actual Python defined SO ABI extension"

  Show description for 2aa1e48
  rburema

  committed
  2aa1e48

• Remove redundant sanitize_list macro

  Show description for 0c62785
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  0c62785

• Sip 6 can handle enum class.

  Show description for b991cc7
  rburema

  committed
  b991cc7

Commits on Feb 28, 2022

• Merge pull request #131 from Ultimaker/CURA-7924_sip_cmake_build

  Show description for 83dffa4
  nallath

  authored
  83dffa4

Commits on Mar 3, 2022

• Added StandardProjectSettings module

  Show description for 1ffcc3d
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  1ffcc3d

Commits on Mar 4, 2022

• use arguments for function use_rpaths

  Show description for 12fdb07
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  12fdb07

• escape dollar sign on ORIGIN rpath

  Show description for cc167f1
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  cc167f1

• allways full RPATH

  Show description for de5ce6b
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  de5ce6b

• set rpath for sip_<interface_target> target

  Show description for 7376d78
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  7376d78

• Revert "set rpath for sip_<interface_target> target"

  Show description for 805bcec
  jellespijker

  committed
  805bcec

• transfer rpath properties to sip_target

  Show description for 2deab5c
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  2deab5c

• Fixed setting of multiple paths

  Show description for c34fbe4
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  c34fbe4

• Added Linux AppImage paths

  Show description for bdfc059
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  bdfc059

• Sync SIPMAcros.cmake with Savitar

  Show description for 6014174
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  6014174

• Revert "Sync SIPMAcros.cmake with Savitar"

  Show description for 4dffd0c
  jellespijker

  committed
  4dffd0c

• Added relative rpath to lib from site-packages

  Show description for 12acc2d
  jellespijker

  committed
  12acc2d

Commits on Mar 8, 2022

• Also use relative rpath from loader

  Show description for 3c724a6
  jellespijker

  committed
  3c724a6

• Also add the ../Resources/lib/

  Show description for 58a94a0
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  58a94a0

Commits on Mar 14, 2022

• Bumped up version and so version to 5

  Show description for 659796e
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  659796e

Commits on Mar 29, 2022

• Allow usage of Conan

  Show description for e6d6b6f
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  e6d6b6f

Commits on Mar 31, 2022

• Set PYTHONPATH with cmake variable

  Show description for 5d1d390
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  5d1d390

Commits on Apr 4, 2022

• Set PYTHONPATH with cmake variable

  Show description for 053d794
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  053d794

• Mimic find package variables Python

  Show description for 20dd9d0
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  20dd9d0

• Also use PYTHONPATH when generating for the first time

  Show description for 2f408d6
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  2f408d6

Commits on Apr 5, 2022

• Allow defining local site-package install path

  Show description for 26dbff7
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  26dbff7

Commits on Apr 12, 2022

• Bump up minimum supported CMake version

  Show description for 766f634
  jellespijker

  committed
  766f634

• Bump up minimum supported CMake version

  Show description for 045fed6
  jellespijker

  committed
  045fed6

• Removed CPack support

  Show description for 7350da2
  jellespijker

  committed
  7350da2

• Removed protobuf Module compatibility workaround

  Show description for 4ba8dda
  jellespijker

  committed
  4ba8dda

• Removed obsolete Export Header

  Show description for 2be1f55
  jellespijker

  committed
  2be1f55

Commits on Apr 13, 2022

• Revert "Removed obsolete Export Header"

  Show description for 845b021
  jellespijker

  committed
  845b021

• Remove Example

  Show description for c8aed1b
  jellespijker

  committed
  c8aed1b

• Review suggestion implemented

  Show description for e583bb8
  jellespijker

  committed
  e583bb8

• Remove obsolete jenkins file

  Show description for 9a89a3b
  jellespijker

  committed
  9a89a3b

• Add cmake-build to gitignore

  Show description for b42fae3
  jellespijker

  committed
  b42fae3

• We don't use mingw anymore

  Show description for 8504b4f
  jellespijker

  committed
  8504b4f

• codestyle change on assure_out_of_source_builds

  Show description for 7373fbf
  jellespijker

  committed
  7373fbf

• Using BUILD_SHARED_LIBS flag instead of BUILD_STATIC

  Show description for 6b1b7c2
  jellespijker

  committed
  6b1b7c2

• Remove CICD

  Show description for 24199a7
  jellespijker

  committed
  24199a7

Commits on Apr 14, 2022

• Fix wrong function call assure_out_of_source_builds

  Show description for 740514d
  jellespijker

  committed
  740514d

• Use Python_VERSION for Cpython site-packages

  Show description for 55ac188
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  55ac188

• Allow static build of the Python Module

  Show description for 6636816
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  6636816

• Allow in source builds

  Show description for a69cd0f
  

  j.spijker@ultimaker.com

  authored and

  jellespijker

  committed
  a69cd0f