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

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.

Reviewers: gladhorn, sebas, romangg, apol

Reviewed By: apol

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D14031
parent 644bc8c5
......@@ -13,6 +13,14 @@ set(KF5_MIN_VERSION "5.42.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMInstallIcons)
include(ECMMarkAsTest)
include(ECMQtDeclareLoggingCategory)
include(FeatureSummary)
find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS QuickWidgets Test)
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
DBusAddons
......@@ -32,14 +40,6 @@ find_package(KF5 REQUIRED COMPONENTS PlasmaQuick)
set(MIN_LIBKSCREEN_VERSION "5.2.91")
find_package(KF5Screen ${MIN_LIBKSCREEN_VERSION} REQUIRED)
include(KDEInstallDirs)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
include(ECMInstallIcons)
include(ECMMarkAsTest)
include(FeatureSummary)
include(ECMQtDeclareLoggingCategory)
add_subdirectory(icons)
add_subdirectory(kcm)
add_subdirectory(kded)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment