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-12261 Fix mac build issues for 3DCONNEXION mouse integration #20182

Merged
merged 388 commits into from
Feb 13, 2025
Merged
Changes from 1 commit
Commits
Show all changes
388 commits
Select commit Hold shift + click to select a range
bec1ff1
Fix pyinstaller resources deployment
wawanbreton Nov 14, 2024
4adcff4
Merge remote-tracking branch 'refs/remotes/origin/CURA-11622_conan_v2…
wawanbreton Nov 14, 2024
8bd69ec
Store versions script in deploy folder
wawanbreton Nov 14, 2024
85cd142
Add explicit errors on missing package information
wawanbreton Nov 14, 2024
e13bf9f
Merge pull request #19908 from Ultimaker/CURA-12301_Warning-for-scarf…
HellAholic Nov 14, 2024
3910ab0
Do not include enterprise resources if not needed
wawanbreton Nov 14, 2024
a5a0aad
Merge pull request #19900 from Ultimaker/fix_crashlog_errors
HellAholic Nov 14, 2024
f50676a
Fix pyinstaller file generation in some cases
wawanbreton Nov 14, 2024
cd48c7c
Add debug information for python dependencies generation
wawanbreton Nov 15, 2024
0e36320
Remove specific PYTHONPATH
wawanbreton Nov 15, 2024
35e52ef
Change environment to gater Python dependencies
wawanbreton Nov 15, 2024
671247c
Merge pull request #19907 from Ultimaker/CURA-12292_Seam-Corner-Prefe…
Vandresc Nov 15, 2024
ebe7018
Use Python virtual env to get dependencies
wawanbreton Nov 15, 2024
f60090d
Merge pull request #19898 from Ultimaker/CURA-12282-url-schemes-df
HellAholic Nov 15, 2024
806fede
An other desperate attempt to get the proper env
wawanbreton Nov 15, 2024
13ba3da
Merge pull request #19899 from Ultimaker/CURA-12223_fix_extruder_stac…
HellAholic Nov 15, 2024
656573e
User proper environment to get dependencies list
wawanbreton Nov 15, 2024
fc85817
Change the way we get Python installs
wawanbreton Nov 15, 2024
535b942
Updated Changelog for stable
MariMakes Nov 15, 2024
83dba96
Applied suggestions from the code review
MariMakes Nov 18, 2024
5b3eef6
More review changes
MariMakes Nov 18, 2024
dbef12c
Merge branch 'CURA-12285_ChangelogStable' of https://github.com/Ultim…
MariMakes Nov 18, 2024
6a7cfca
Revert "Change the way we get Python installs"
wawanbreton Nov 18, 2024
e044d94
Use virtual env for dependencies
wawanbreton Nov 18, 2024
bd6cf74
Fix warning issue Method machines with BASF Metal filament.
pkuiper-ultimaker Nov 18, 2024
5be6e56
Revert "Fix warning issue Method machines with BASF Metal filament."
casperlamboo Nov 18, 2024
de3613e
Fix warning issue Method machines with BASF Metal filament.
pkuiper-ultimaker Nov 18, 2024
97f9fab
Merge pull request #19921 from Ultimaker/PP-541-fix-warnings
HellAholic Nov 18, 2024
ed5a12d
Remove ZYYX Pro II printer which remains untested
wawanbreton Nov 18, 2024
4949ffd
Remove mention of ZYYX Pro II
wawanbreton Nov 18, 2024
4866495
Merge pull request #19922 from Ultimaker/CURA-12312_Remove-ZYYX-Pro-I…
HellAholic Nov 18, 2024
8551e3c
Add notes for Z-fighting bug and Wayland performance
wawanbreton Nov 18, 2024
596615c
Remove double message
wawanbreton Nov 18, 2024
18cc068
Merge pull request #19912 from Ultimaker/CURA-12285_ChangelogStable
HellAholic Nov 18, 2024
23b8962
Split dev and installer requirements
wawanbreton Nov 19, 2024
5e204ab
Use virtual python env to get dependencies
wawanbreton Nov 19, 2024
f02d0f8
Merge branch 'main' into voron-nozzles
WCEngineer Nov 19, 2024
0286c6d
Merge remote-tracking branch 'origin/5.9'
wawanbreton Nov 20, 2024
f282f87
Update UltiMaker-Cura.spec.jinja
core-code Nov 20, 2024
43a3db9
Remove build steps from Conan recipe
wawanbreton Nov 20, 2024
f2343e9
Remove dead code
wawanbreton Nov 21, 2024
9bc6abc
Merge branch 'main' into CURA-12192_replay-preview-at-last-layer
HellAholic Nov 21, 2024
b8fd3d7
Remove pyinstaller spec generation at generate() time
wawanbreton Nov 21, 2024
50b13cd
Cleanup code
wawanbreton Nov 22, 2024
2b8a960
Use most recent get-diff action
wawanbreton Nov 22, 2024
1feadb4
Update/fix nightly build (untested)
wawanbreton Nov 26, 2024
b9a9150
Always build binary translations files at build time
wawanbreton Nov 26, 2024
644751f
Restore binaries upload for nightlies
wawanbreton Nov 26, 2024
bb07c08
Remove the nightlies build from installers
wawanbreton Nov 26, 2024
6d0a30d
Use simplified package creation workflow
wawanbreton Nov 26, 2024
9002e01
Fix syntax of thrown errors.
rburema Nov 26, 2024
c8f040e
Use production environment for Sentry
wawanbreton Nov 27, 2024
a1657dc
Use more explicit tag for nightlies
wawanbreton Nov 27, 2024
6313a89
Use uptodate install python script
wawanbreton Nov 27, 2024
b46c89a
Update release candidate workflow
wawanbreton Nov 27, 2024
11579c2
Merge remote-tracking branch 'refs/remotes/origin/CURA-11622_conan_v2…
wawanbreton Nov 27, 2024
5782ee4
Fix called step name
wawanbreton Nov 27, 2024
6704265
Use the workflows from the branch
wawanbreton Nov 27, 2024
a9a4c5d
Fix jobs dependencies
wawanbreton Nov 27, 2024
09be772
Use workflows from branch
wawanbreton Nov 27, 2024
0000ba3
Use gettext tools in path (experimental)
wawanbreton Nov 27, 2024
19743d0
Remove windows installer architecture argument
wawanbreton Nov 27, 2024
0b32376
Set proper repository name for packages creation
wawanbreton Nov 27, 2024
dd659e3
Give branch name to script to avoid recalculating it
wawanbreton Nov 27, 2024
2ef1462
Update pywin32.
rburema Nov 26, 2024
b7a5b2f
(win build) make it work locally again
rburema Nov 27, 2024
1296101
Name installers
wawanbreton Nov 27, 2024
428ea3a
Merge pull request #16963 from NerdyGriffin/voron-nozzles
nallath Nov 27, 2024
af22593
Remove version limit
wawanbreton Nov 27, 2024
70f01f2
Merge remote-tracking branch 'refs/remotes/origin/CURA-11622_conan_v2…
wawanbreton Nov 27, 2024
33ac9a9
Use workflow from branch
wawanbreton Nov 27, 2024
9238e7e
Give proper branch name
wawanbreton Nov 27, 2024
8e25302
Merge remote-tracking branch 'origin/main' into CURA-11622_conan_v2
wawanbreton Nov 27, 2024
d8200a3
Use simplified package creation workflow
wawanbreton Nov 27, 2024
f807af1
Add warning for Conan2 migration
wawanbreton Nov 28, 2024
07bb38e
Merge pull request #19895 from Ultimaker/CURA-12192_replay-preview-at…
HellAholic Nov 28, 2024
0d5d0fe
Rename tmp Python file to a more explicit name
wawanbreton Nov 28, 2024
1b83a35
Update Mac installer workflow
wawanbreton Nov 28, 2024
05aecd7
Bump pywin32 and pywin32-ctypes
wawanbreton Nov 28, 2024
f59e19f
Update python version
wawanbreton Nov 29, 2024
c002ba7
Bump dulcificum version
wawanbreton Nov 29, 2024
55e2967
Use proper dulcificum version
wawanbreton Nov 29, 2024
e9d5912
Merge pull request #19768 from dmitrygribenchuk/code_style_fixes
nallath Nov 29, 2024
85c2d2f
Use common script for installers
wawanbreton Nov 29, 2024
1b9f1c5
Add preference to actually set the flip preference for Y handle
nallath Nov 29, 2024
a1d59b2
Use proper package name for charon/libcharon
wawanbreton Nov 29, 2024
c245b29
Add hash for setuptools package
wawanbreton Nov 29, 2024
7b9c662
add resolveOrValue
HellAholic Dec 1, 2024
ef8ddcf
bump version
HellAholic Dec 2, 2024
63f91fa
Applied printer-linter format
HellAholic Dec 2, 2024
8d332f5
Revert CPython to 3.12.2
wawanbreton Dec 2, 2024
dfbc17a
Display commands of package creation
wawanbreton Dec 2, 2024
6aa386b
Fix display of executed command
wawanbreton Dec 2, 2024
68175c2
Display all commands and fail on error
wawanbreton Dec 2, 2024
80b7bab
Bump pyinstaller version
wawanbreton Dec 2, 2024
285126e
Remove pywin32 explicit dependency
wawanbreton Dec 3, 2024
23edccc
Restore pywin32-ctypes and bump keyring version
wawanbreton Dec 3, 2024
00f599a
Add hashes for dependencies of keyring
wawanbreton Dec 3, 2024
67924d2
Bump dependencies versions
wawanbreton Dec 3, 2024
3ac81e5
Require explicit arguments
wawanbreton Dec 3, 2024
909efcb
Require explicit arguments
wawanbreton Dec 3, 2024
cb9a948
Fix installer name
wawanbreton Dec 3, 2024
e248737
Remove QtNetwork-Auth unused dependency
wawanbreton Dec 3, 2024
41526bf
Prepare for merge
wawanbreton Dec 4, 2024
10633d4
Remove now-useless script generation
wawanbreton Dec 4, 2024
8755e2a
Merge branch 'main' into CURA-11622_conan_v2
wawanbreton Dec 4, 2024
3547f86
Merge pull request #19960 from Ultimaker/CURA-11622_conan_v2
wawanbreton Dec 4, 2024
e01f976
Fiux nightly workflow
wawanbreton Dec 5, 2024
6445cb0
(Win installer) PyInstaller missed this module, supposedly adding it …
rburema Dec 5, 2024
e2e46cd
Properly use the new common workflow
wawanbreton Dec 6, 2024
48dffc9
Merge remote-tracking branch 'refs/remotes/origin/main'
wawanbreton Dec 6, 2024
d50237f
Pass secrets to common nightly workflow
wawanbreton Dec 6, 2024
30205e1
Update description Add (restart required)
HellAholic Dec 7, 2024
d8b3e77
update label for clarity
HellAholic Dec 9, 2024
4c686af
Update machine head & fan polygon description
HellAholic Dec 9, 2024
d5cf5f6
Applied printer-linter format
HellAholic Dec 9, 2024
c6a2cce
Remove duplicated keychain entry.
rburema Dec 10, 2024
23cc0b4
Hopefully all of the hidden imports are OK now for keyring.
rburema Dec 10, 2024
ef02ab5
Try if we can get rid of this workaround.
rburema Dec 10, 2024
f9e138d
Add setting for multi-value overhang speed reduction
wawanbreton Dec 10, 2024
e2c3dd6
Try to fix that not all pyqt dynamic libs are in the win-install.
rburema Dec 10, 2024
89287f8
(win-install) That pulled in too much pyqt, try more fine-grained.
rburema Dec 10, 2024
5e59458
More needed PyQt for Windows?
rburema Dec 10, 2024
55f59b7
Better rid of 'forbidden modules' and related folders.
rburema Dec 10, 2024
cc93e8c
Prune included binaries.
rburema Dec 10, 2024
66c1a08
Added the additional hooks folder now present in the cura-workflows r…
rburema Dec 11, 2024
bec87b8
(installer) Unwanted files are in there, try if it can start without.
rburema Dec 11, 2024
cca70d8
Install: Fix MacOs; Previous Windows fixes caused Mac build to fail.
rburema Dec 11, 2024
f54eeed
Fix the rename script call path
wawanbreton Dec 12, 2024
d5b4cad
Improve setting description
wawanbreton Dec 12, 2024
dd4b9e8
Allow package overrides when building installers
wawanbreton Dec 12, 2024
a7ac441
Revert "Allow package overrides when building installers"
wawanbreton Dec 13, 2024
5d08f8e
Allow package overrides when building installers
wawanbreton Dec 12, 2024
20b311f
Set proper default version value
wawanbreton Dec 13, 2024
0b66120
Allow specific installers to have package overrides
wawanbreton Dec 13, 2024
9735bcf
Remove previous single overhang angle
wawanbreton Dec 13, 2024
a758ebb
Applied printer-linter format
wawanbreton Dec 13, 2024
5047075
Use proper private materials data
wawanbreton Dec 13, 2024
97c89ed
Set empty package version for installers by default
wawanbreton Dec 13, 2024
fb720c3
Set version as not required
wawanbreton Dec 13, 2024
cd49eb3
Use proper user for private data
wawanbreton Dec 13, 2024
86e799e
Use fdm_materials_private when appropriate
wawanbreton Dec 13, 2024
ddb5aee
Use private data from internal conan-user
wawanbreton Dec 13, 2024
7093674
Fix nightly release notes creation
wawanbreton Dec 16, 2024
e0689f9
Remove scary warning for conan migration
wawanbreton Dec 16, 2024
8fc9327
Revert "Applied printer-linter format"
wawanbreton Dec 16, 2024
078fccc
Add setting for minimum layer time with overhang
wawanbreton Dec 16, 2024
d83a841
Merge branch 'CURA-11966_reduce-speed-on-overhang' into CURA-12352_di…
wawanbreton Dec 16, 2024
a886001
Add setting for inner combing distance to walls
wawanbreton Dec 16, 2024
0785e6f
Applied printer-linter format
wawanbreton Dec 16, 2024
0efa90a
Fix release-notes file path
wawanbreton Dec 17, 2024
e11d0db
Merge pull request #19515 from EmJay276/PR_GCodeReader_relative_extru…
HellAholic Dec 17, 2024
f95d073
Use common linter workflow
wawanbreton Dec 17, 2024
d1932b5
Fix file patterns syntax, maybe
wawanbreton Dec 17, 2024
5ccb96e
Adjust nightly builds tags
wawanbreton Dec 18, 2024
29cb2b1
Polish setting name and description
wawanbreton Dec 18, 2024
02ab5dd
Applied printer-linter format
wawanbreton Dec 18, 2024
33a57ad
Merge branch 'main' into CURA-12236_expose-preferred-travel-area-in-c…
wawanbreton Dec 18, 2024
5f81ba3
Remove unwanted files
wawanbreton Dec 18, 2024
2ad64e1
Introduce Cheetah flavor
Frederic98 Dec 18, 2024
0917f10
Fix cloud connection for Sketch Sprint and Large
Frederic98 Dec 19, 2024
2951a6b
Fix nightly release notes syntax
wawanbreton Dec 20, 2024
3459800
Display proper CuraEngine packaging action result
wawanbreton Dec 20, 2024
07880cd
Always display sub-packages main branch results
wawanbreton Dec 20, 2024
f178727
Set proper method to define env variables
wawanbreton Dec 20, 2024
382b98e
Fix wrong setting version on profiles
wawanbreton Dec 20, 2024
2fad92b
Merge remote-tracking branch 'origin/main' into CURA-11966_reduce-spe…
wawanbreton Jan 8, 2025
66402ff
Use single extruder when exporting for Replicator+
wawanbreton Jan 9, 2025
b82bb8d
Merge remote-tracking branch 'origin/CURA-11966_reduce-speed-on-overh…
wawanbreton Jan 9, 2025
3276fc2
Add setting to filter out layers that have small overhanging faetures
wawanbreton Jan 9, 2025
87072cc
Add metallic PLA quality files for Sketch printers
alanbjorklund Jan 9, 2025
5ecfa59
Removed metallic PLA from Sketch exclude list
alanbjorklund Jan 10, 2025
1a2de1b
Merge branch 'main' into CURA-12236_expose-preferred-travel-area-in-c…
HellAholic Jan 13, 2025
75cf32c
Merge pull request #20041 from Ultimaker/CURA-12236_expose-preferred-…
HellAholic Jan 13, 2025
2db4d16
Update altered overhang wall-speed setting to new version.
rburema Jan 16, 2025
2ca18cc
Add version-upgrader to 5.10
rburema Jan 16, 2025
fbe8717
Apply printer-linter format
rburema Jan 16, 2025
e6d2281
Merge branch 'main' into CURA-12352_different-minimum-layer-time-for-…
HellAholic Jan 17, 2025
43b19c3
PP-554 Kedge Visual Intents
alanbjorklund Jan 17, 2025
128d73a
Merge branch 'main' into PP-549_fix_sketch_sprint_cloud
HellAholic Jan 20, 2025
ffb4521
Merge branch 'main' into CURA-11966_reduce-speed-on-overhang
wawanbreton Jan 20, 2025
73519a3
Remove + character from bundle identifier
wawanbreton Jan 21, 2025
5063b82
Merge branch 'main' into CURA-11966_reduce-speed-on-overhang
HellAholic Jan 21, 2025
a13726b
Move interlocking settings out of experimental
wawanbreton Jan 22, 2025
a244e0e
Merge branch 'main' into CURA-12313_conditional-Baxis-commands
wawanbreton Jan 22, 2025
3095acd
Merge pull request #20165 from Ultimaker/CURA-12247_move-interlocking…
HellAholic Jan 22, 2025
0f0af30
Merge branch 'main' into CURA-12362_Cheetah_flavor
HellAholic Jan 22, 2025
038e8b7
Warn for mismatched cores on multi-config printers.
rburema Jan 22, 2025
e8b2aba
Merge branch 'main' into flip_toolhandle_y_description
HellAholic Jan 23, 2025
ce25f73
Merge pull request #20006 from Ultimaker/flip_toolhandle_y_description
HellAholic Jan 23, 2025
4a30660
Remove pydir and workflow folder
HellAholic Jan 23, 2025
b5e25bb
Merge pull request #20174 from Ultimaker/chore_issue_fix
HellAholic Jan 23, 2025
bbf7b4d
Merge branch 'main' into CURA-12362_Cheetah_flavor
HellAholic Jan 23, 2025
9d81764
Merge pull request #20145 from Ultimaker/CURA-12362_Cheetah_flavor
HellAholic Jan 23, 2025
f86f5d5
Merge branch 'main' into PP-554-Kedge-Roof
HellAholic Jan 24, 2025
12b779a
Merge branch 'main' into patch-1
wawanbreton Jan 24, 2025
8a4e7f1
Merge pull request #19932 from core-code/patch-1
wawanbreton Jan 24, 2025
6157310
Merge pull request #20137 from Ultimaker/PP-554-Kedge-Roof
HellAholic Jan 24, 2025
7a96221
Merging CURA-7435_3DConnexionII
casperlamboo Jan 24, 2025
c63c697
Apply printer-linter format
casperlamboo Jan 24, 2025
7eb9b15
Pin cura package version
casperlamboo Jan 24, 2025
f3593ba
Merge remote-tracking branch 'origin/CURA-12261-3dconnectionmouse' in…
casperlamboo Jan 24, 2025
539e627
Move `pynavlib` dependency to `any_os` section
casperlamboo Jan 24, 2025
6c9b33f
Fix syntax error in pynavlib dependency
casperlamboo Jan 24, 2025
b282712
Fix syntax error in pynavlib dependency
casperlamboo Jan 24, 2025
983d0a4
combine hashes for pynavlib dependency
casperlamboo Jan 24, 2025
caa944e
Merge branch 'main' into PP-552-Metallic-PLA
wawanbreton Jan 27, 2025
04a6ecf
Add local setting to monitor use of USB writing
wawanbreton Jan 27, 2025
3b2d0fd
Slightly reduce the width of setting fields
wawanbreton Jan 27, 2025
2e59a0a
Give more space to text when required
wawanbreton Jan 27, 2025
ccbd537
Merge pull request #20118 from Ultimaker/PP-552-Metallic-PLA
HellAholic Jan 28, 2025
669c28e
Try to make unavailable configuration warnings less confusing.
rburema Jan 28, 2025
c369a40
Set dynamic items size
wawanbreton Jan 28, 2025
2d16106
Merge branch 'main' into CURA-12150-add-a-global-preference-for-USB-p…
HellAholic Jan 28, 2025
ebedb66
Merge branch 'main' into CURA-12224_handle-LOOOONG-setting-names
HellAholic Jan 28, 2025
eec90b5
[PP-535] Add pressure advance setting
Frederic98 Jan 29, 2025
72e3853
Merge branch 'main' into CURA-11966_reduce-speed-on-overhang
HellAholic Jan 29, 2025
05f6afd
Round layer height to two decimals for display (profile) purposes.
rburema Jan 29, 2025
0680a21
apply review comment
HellAholic Jan 29, 2025
40f738f
Applied printer-linter format
HellAholic Jan 29, 2025
628c852
Merge pull request #20169 from Ultimaker/CURA-12368_mismatched_core_w…
HellAholic Jan 29, 2025
49cc44b
Merge pull request #19983 from Ultimaker/fix_crash_on_material_manage…
HellAholic Jan 29, 2025
150a267
switch from branch to stable in conandata for dulcificum
HellAholic Jan 29, 2025
1e6afd7
Merge branch 'main' into CURA-12313_conditional-Baxis-commands
HellAholic Jan 29, 2025
d765f33
Merge pull request #20115 from Ultimaker/CURA-12313_conditional-Baxis…
HellAholic Jan 29, 2025
9295382
Merge pull request #20210 from Ultimaker/CURA-12020_defensive_round
HellAholic Jan 29, 2025
1b48582
Merge branch 'main' into PP-535_add_pa_setting
HellAholic Jan 30, 2025
a62ed73
Merge pull request #20194 from Ultimaker/CURA-12224_handle-LOOOONG-se…
HellAholic Jan 30, 2025
cd6827c
Merge pull request #20208 from Ultimaker/PP-535_add_pa_setting
HellAholic Jan 30, 2025
67d8535
Merge branch 'main' into CURA-12150-add-a-global-preference-for-USB-p…
HellAholic Jan 30, 2025
23cb08e
Merge pull request #20193 from Ultimaker/CURA-12150-add-a-global-pref…
HellAholic Jan 30, 2025
c72cb23
Update pynavlib dependency
casperlamboo Jan 31, 2025
a695a27
Merge branch 'main' into CURA-11966_reduce-speed-on-overhang
HellAholic Feb 3, 2025
896b401
Merge pull request #20040 from Ultimaker/CURA-11966_reduce-speed-on-o…
HellAholic Feb 3, 2025
4be40f7
Merge branch 'main' into CURA-12352_different-minimum-layer-time-for-…
HellAholic Feb 3, 2025
28cf7da
Merge pull request #20039 from Ultimaker/CURA-12352_different-minimum…
HellAholic Feb 3, 2025
b4573a3
Merge pull request #20052 from Ultimaker/PP-549_fix_sketch_sprint_cloud
wawanbreton Feb 4, 2025
0a936be
Remove now-useless comment
wawanbreton Feb 5, 2025
eb5c5a1
Merge remote-tracking branch 'origin/main' into CURA-12261-3dconnecti…
wawanbreton Feb 6, 2025
f23e881
Use workflow from branch
wawanbreton Feb 6, 2025
5cf52a5
Define dummy 3DConnexion interface in case module is not available
wawanbreton Feb 7, 2025
b2bb7c6
Allow giving a specific OS when looking for pip package
wawanbreton Feb 7, 2025
b338a37
Install pynavlib only on Windows and Mac
wawanbreton Feb 7, 2025
9a92451
Change the dynamic class definition to be more elegant
wawanbreton Feb 7, 2025
c072c11
Restore pynavlib path before bundle
wawanbreton Feb 10, 2025
451ad69
Revert "Restore pynavlib path before bundle"
wawanbreton Feb 10, 2025
3db1312
Merge branch 'CURA-12261-3dconnectionmouse' into CURA-12404_add-exept…
HellAholic Feb 13, 2025
70e3d7d
Merge branch 'CURA-7435_3DConnexion' into CURA-12261-3dconnectionmouse
HellAholic Feb 13, 2025
f85e8f7
Merge branch 'CURA-12261-3dconnectionmouse' into CURA-12404_add-exept…
HellAholic Feb 13, 2025
1590980
Merge pull request #20249 from Ultimaker/CURA-12404_add-exeption-when…
HellAholic Feb 13, 2025
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
Set proper method to define env variables
  • Loading branch information
wawanbreton committed Dec 20, 2024
commit f17872725ada7803bdf53027d4cf7b6117a06dd6
6 changes: 3 additions & 3 deletions resources/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ def package(self):

def package_info(self):
self.cpp_info.includedirs = []
self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res"))
self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions"))
self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders"))
self.runenv_info.define("CURA_RESOURCES", os.path.join(self.package_folder, "res"))
self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions"))
self.runenv_info.define("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders"))

def package_id(self):
self.info.clear()
Loading