https://bugs.kde.org/show_bug.cgi?id=426219
--- Comment #6 from Michael Pyne <mp...@kde.org> --- Git commit ed1545b71654c7e9dc3f3ca65e0c29ef1f6d92c5 by Michael Pyne. Committed on 27/09/2020 at 19:52. Pushed by mpyne into branch 'master'. setup: Break out common 'options' blocks for kdesrc-build-setup to always use. This change should address the immediate breakage that a user had when using kdesrc-build-setup, choosing no major module groups, and then using kdesrc-build to eventually build bluez-qt. In that case, bluez-qt had an 'options' block in kf5-frameworks-build-include to address the error he'd experienced, however since kdesrc-build-setup didn't generate a include to that file, the options weren't picked up either. kdesrc-build later found the module via include-dependencies and built it anyways. To fix this, break out "always-set" options into a dedicated file (kf5-common-options-build-include) and include that from kdesrc-build-setup-generated files always. I moved these from kf5-frameworks-build-include so I added an include from that file back to kf5-common-options-build-include for backwards compatibility for existing users. This relies on duplicate options blocks continuing to work (similar to C++'s One Definition Rule) so I've documented that in the code for now. M +1 -0 CMakeLists.txt M +10 -5 kdesrc-build-setup A +19 -0 kf5-common-options-build-include M +4 -15 kf5-frameworks-build-include M +2 -0 kf5-qt5-build-include M +2 -0 kf5-workspace-build-include M +5 -0 modules/ksb/Application.pm M +6 -1 modules/ksb/FirstRun.pm https://invent.kde.org/sdk/kdesrc-build/commit/ed1545b71654c7e9dc3f3ca65e0c29ef1f6d92c5 -- You are receiving this mail because: You are watching all bug changes.
