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

qt6: prevent finding zstd when it is disabled #24701

Merged
merged 2 commits into from
Jul 25, 2024
Merged

qt6: prevent finding zstd when it is disabled #24701

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c05d38
qt6: fix issue finding threads/zstd on macos
jcar87 Jul 24, 2024
415b3ac
wip
jcar87 Jul 24, 2024
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
2 changes: 2 additions & 0 deletions recipes/qt/6.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,6 +521,8 @@ def generate(self):
tc.variables["FEATURE_dbus"] = "OFF"
tc.variables["CMAKE_FIND_DEBUG_MODE"] = "FALSE"

if not self.options.with_zstd:
tc.variables["CMAKE_DISABLE_FIND_PACKAGE_WrapZSTD"] = "ON"

for opt, conf_arg in [("with_glib", "glib"),
("with_icu", "icu"),
Expand Down
Loading