Use imported targets instead of qt5_use_modules

From Qt's documentation: "This macro is obsolete. Use
target_link_libraries with IMPORTED targets instead." It's only
recommended with cmake >=2.8.9 & < 2.8.12. Kube already requires
cmake 3.0.
One advantage of using the imported targets is, that
cmake complains if a target isn't found before it's used, like
Qt5Concurrent missing from the find_package_call here.

Reviewers: #kube, cmollekopf

Reviewed By: #kube, cmollekopf

Subscribers: #kube

Differential Revision: https://phabricator.kde.org/D6362

3 files changed, 29 insertions, 7 deletions

diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt
index 75357b68..034feba9 100644
--- a/framework/src/CMakeLists.txt
+++ b/framework/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-find_package(Qt5 COMPONENTS REQUIRED Core Qml)
+find_package(Qt5 COMPONENTS REQUIRED Core Quick Qml WebEngineWidgets Test)
 find_package(KF5Mime "4.87.0" CONFIG REQUIRED)
 find_package(Sink CONFIG REQUIRED)
 find_package(KAsync CONFIG REQUIRED)
@@ -43,8 +43,19 @@ set(SRCS
 )
 
 add_library(frameworkplugin SHARED ${SRCS})
-qt5_use_modules(frameworkplugin Core Quick Qml WebEngineWidgets Test)
-target_link_libraries(frameworkplugin sink kube_otp KF5::Codecs KF5::Package KF5::Contacts KAsync)
+target_link_libraries(frameworkplugin
+    sink
+    kube_otp
+    Qt5::Core
+    Qt5::Quick
+    Qt5::Qml
+    Qt5::WebEngineWidgets
+    Qt5::Test
+    KF5::Codecs
+    KF5::Contacts
+    KF5::Package
+    KAsync
+)
 install(TARGETS frameworkplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
 
 set(BUILD_TESTING ON)
diff --git a/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt b/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt
index 89d97823..015efc32 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt
+++ b/framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt
@@ -10,8 +10,12 @@ include(ECMAddTests)
 
 add_executable(mimetreeparsertest interfacetest.cpp)
 add_gpg_crypto_test(mimetreeparsertest mimetreeparsertest)
-qt5_use_modules(mimetreeparsertest Core Test)
-target_link_libraries(mimetreeparsertest KF5::Mime kube_otp)
+target_link_libraries(mimetreeparsertest
+    kube_otp
+    Qt5::Core
+    Qt5::Test
+    KF5::Mime
+)
 
 find_package(Gpgmepp 1.7.1 CONFIG)
 find_package(QGpgme 1.7.1 CONFIG)
diff --git a/framework/src/domain/settings/CMakeLists.txt b/framework/src/domain/settings/CMakeLists.txt
index dc9d01b1..e9ea76c6 100644
--- a/framework/src/domain/settings/CMakeLists.txt
+++ b/framework/src/domain/settings/CMakeLists.txt
@@ -2,5 +2,12 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 cmake_policy(SET CMP0063 NEW)
 add_executable(sinkactiontest sinkactiontest.cpp)
 add_test(sinkactiontest sinkactiontest)
-qt5_use_modules(sinkactiontest Core Test Concurrent)
-target_link_libraries(sinkactiontest sink actionplugin KF5::Mime mailplugin)
+target_link_libraries(sinkactiontest
+    sink
+    actionplugin
+    mailplugin
+    Qt5::Core
+    Qt5::Concurrent
+    Qt5::Test
+    KF5::Mime
+)