[sdk/kde-builder] kde_builder_lib: fix: Warn about removed qt6-set projects in case the qt6-set group was requested explicitly
Andrew Shark <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit e3a876bd6a5eb9e0d6350b5e842448a1d1d9e2fe by Andrew Shark.
Committed on 02/08/2026 at 13:00.
Pushed by ashark into branch 'master'.
fix: Warn about removed qt6-set projects in case the qt6-set group was requested explicitly
M +10 -8 kde_builder_lib/module_resolver.py
https://invent.kde.org/sdk/kde-builder/-/commit/e3a876bd6a5eb9e0d6350b5e842448a1d1d9e2fe
diff --git a/kde_builder_lib/module_resolver.py b/kde_builder_lib/module_resolver.py
index 19a60003..dae86f9e 100644
--- a/kde_builder_lib/module_resolver.py
+++ b/kde_builder_lib/module_resolver.py
@@ -319,18 +319,20 @@ class ModuleResolver:
else:
logger_modres.debug(f"Group y[{module_set_name}] is ignored, so project y[{module.name}] was removed.")
continue
- elif module_set_name in ["qt6-set"]:
- if module.get_option("install-dir") == "":
- # User may have set their qt-install-dir option to empty string (the default), which means disabling building qt modules.
- # But still user can accidentally request to build some qt modules (by explicitly specifying such modules in cmdline, or
- # by building all). We should not allow building qt modules in such case.
- # Otherwise, as their real "install-dir" is empty, their CMAKE_INSTALL_PREFIX will be incorrect (set to empty), and such
- # modules could not pass cmake configure.
+ elif module_set_name == "qt6-set" and module.get_option("install-dir") == "":
+ # User may have set their qt-install-dir option to empty string (the default), which means disabling building qt modules.
+ # But still user can accidentally request to build some qt modules (by explicitly specifying such modules in cmdline, or
+ # by building all). We should not allow building qt modules in such case.
+ # Otherwise, as their real "install-dir" is empty, their CMAKE_INSTALL_PREFIX will be incorrect (set to empty), and such
+ # modules could not pass cmake configure.
+ if module_set_name in self.explicit_group_selectors:
+ logger_modres.warning(f" y[*] Group y[{module_set_name}] was explicitly selected in command line, but was removed due to qt-install-dir, so project y[{module.name}] was removed.")
+ else:
if module.name in self.explicit_thirdparty_selectors:
logger_modres.warning(f" y[*] Removing y[third-party]/y[{module.name}] due to qt-install-dir")
else:
logger_modres.debug(f"Removing y[third-party]/y[{module.name}] due to qt-install-dir")
- continue
+ continue
if module.is_kde_project():
# Remove projects that are explicitly blanked out in their branch-group,