Move ECM & Co. macro includes before finding Qt & KF
ClosedPublic

Authored by kossebau on Jul 10 2018, 5:16 PM.

Details

Summary

For consistency with other Plasma repos, but also to ensure the ECM
logic for supporting uninstalled unit tests is properly triggered
See
https://api.kde.org/ecm/kde-module/KDECMakeSettings.html#build-settings

Including KDECMakeSettings only after finding KF5CoreAddons and the
implicit loading of KF5PlasmaMacros/KF5PackageMacros resets the
ECM_GLOBAL_FIND_VERSION variable to the min ECM value 1.6.0 currently
used by those macro files, thus below the trigger value 5.38

Test Plan

Still builds and installs as before.

Diff Detail

Repository
R104 KScreen
Branch
movemoduleincludestofront
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 732
Build 744: arc lint + arc unit
kossebau created this revision.Jul 10 2018, 5:16 PM
Restricted Application added a project: Plasma. · View Herald TranscriptJul 10 2018, 5:16 PM
Restricted Application added a subscriber: plasma-devel. · View Herald Transcript
kossebau requested review of this revision.Jul 10 2018, 5:16 PM

That unconditional reset of ECM_GLOBAL_FIND_VERSION is IMHO a flaw which should see some general fix. But no idea yet, so for now change on "our" side.

apol accepted this revision.Jul 10 2018, 7:13 PM
This revision is now accepted and ready to land.Jul 10 2018, 7:13 PM

Seems OK to me.

This revision was automatically updated to reflect the committed changes.