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.

Sign up for GitHub

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

Jump to bottom

Cura 8640 PyQt6 upgrade #17

Merged
merged 25 commits into from
Apr 14, 2022
Merged

Cura 8640 PyQt6 upgrade #17

merged 25 commits into from
Apr 14, 2022

Commits on Mar 4, 2022

  1. Use StandardProjectSettings 

    These allow for a uniform way of handling rpath,
threads etc.

Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Mar 4, 2022
    Configuration menu
    Copy the full SHA
    1931492 View commit details
    Browse the repository at this point in the history

  2. Added relative rpath to lib from site-packages 

    Although not needed at run-time, it is needed for freeze time,
such that cx-freeze can find it.

Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Mar 4, 2022
    Configuration menu
    Copy the full SHA
    a449418 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2022

  1. Also use relative loader for rpath 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    107dd48 View commit details
    Browse the repository at this point in the history

  2. Also add the ../Resources/lib/ 

    ../lib is an symlink to ../Resources/lib/

Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Mar 8, 2022
    Configuration menu
    Copy the full SHA
    044588c View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2022

  1. Use same FindClipper cmake module as libnest2d 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Mar 24, 2022
    Configuration menu
    Copy the full SHA
    2c014f5 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2022

  1. Allow external def of sip-build executable 

    Contributes to CURA-8640
    @jellespijker
    jellespijker committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    9f5ec6d View commit details
    Browse the repository at this point in the history

  2. COnsistent naming of cmake targets with Conan 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    ad5c27e View commit details
    Browse the repository at this point in the history

  3. fixed missing boost header 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    8e7dbd6 View commit details
    Browse the repository at this point in the history

  4. fixed missing boost header 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Mar 30, 2022
    Configuration menu
    Copy the full SHA
    961dabf View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Fix setting environment variable 

    We don't want to set a new variable with as name the current PYTHONPATH. We want to set the PYTHONPATH itself.

Contributes to issue CURA-8640.
    @Ghostkeeper
    Ghostkeeper committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    3d8c767 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Merge remote-tracking branch 'origin/CURA-8640_PyQt6_upgrade' into CU… 

    …RA-8640_PyQt6_upgrade
    @jellespijker
    jellespijker committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    1940ebc View commit details
    Browse the repository at this point in the history

  2. Allow setting PYTHONPATH as CMake arg 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    dc10a09 View commit details
    Browse the repository at this point in the history

  3. Also use the PYTHONPATH on the regenerate stage 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    ea7750f View commit details
    Browse the repository at this point in the history

  4. Use dev component for Python 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    74a34dc View commit details
    Browse the repository at this point in the history

  5. Use conanfile.txt 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    fa33ba0 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2022

  1. Allow local site-packages path 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    35a41bb View commit details
    Browse the repository at this point in the history

  2. Use Libnest2D as namespace for cmake find module 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    a7aa90f View commit details
    Browse the repository at this point in the history

  3. Removed Conan support 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    66fa164 View commit details
    Browse the repository at this point in the history

  4. use correct namespace for Libnest2D 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 5, 2022
    Configuration menu
    Copy the full SHA
    6ff3f82 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Capatelize Boost 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 8, 2022
    Configuration menu
    Copy the full SHA
    3a6989c View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2022

  1. Use Python_VERSION in CPython site-package path 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    e131dae View commit details
    Browse the repository at this point in the history

  2. Don't set target_compiler_feature cxx_std_17 

    Allready taken care of in StandardProjectSettings

Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    99289b9 View commit details
    Browse the repository at this point in the history

  3. Renamed assure_out_of_source_builds 

    codestyle

Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    475fd08 View commit details
    Browse the repository at this point in the history

  4. Use BUILD_SHARED_LIBS instead of BUILD_STATIC 

    BUILD_STATIC was our own custom option while
BUILD_SHARED_LIBS is a global CMake flag

Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    d6e0579 View commit details
    Browse the repository at this point in the history

  5. Clarify the usage of the relative rpath 

    Contributes to CURA-8640
    @jellespijker
    [email protected] authored and jellespijker committed Apr 14, 2022
    Configuration menu
    Copy the full SHA
    fac90e2 View commit details
    Browse the repository at this point in the history