PrusaSlicer: update to 2.5.0. #41548
Conversation
|
Hi, please see changes, I think it is ready for merge.
|
sinetek
requested review from
a user and
sgn
and removed request for
a user and
sgn
|
bump. |
There was a problem hiding this comment.
Squash your commits together; retain the explanation regarding prusa-slicer.desktop.
The other problem I see here is that you want to merge changes from your master branch, not the feature-related like you are supposed to.
From CONTRIBUTING.md:
Using the `master` branch of your fork for contributing is also strongly discouraged.
It can cause many issues with updating your pull request (also called a PR), and having multiple PRs open at once.| build_style=cmake | ||
| build_helper="qemu cmake-wxWidgets-gtk3" | ||
| # Pre-Compiled Headers seems to be slower | ||
| configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3 | ||
| -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF" | ||
| -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP=" |
There was a problem hiding this comment.
| -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP=" | |
| -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP=OFF" |
Why not just set it to OFF? Cmake triggers on booleans, not the contents of the variable:
if (SLIC3R_ENABLE_FORMAT_STEP)
add_subdirectory(occt_wrapper)
endif ()| generate_export_header(OCCTWrapper) | ||
|
|
||
| -find_package(OpenCASCADE 7.6.2 REQUIRED) | ||
| +find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED) |
There was a problem hiding this comment.
| +find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED) | |
| +find_package(OpenCASCADE REQUIRED) |
If I recall it right, omitting the version should also do the trick.
| @@ -0,0 +1,81 @@ | |||
| From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001 | |||
There was a problem hiding this comment.
| From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001 | |
| https://github.com/prusa3d/Prusaslicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4 | |
| From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001 |
|
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it. |
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
Testing the changes
Local build testing