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

11 files changed, 108 insertions, 30 deletions

diff --git a/accounts/gmail/CMakeLists.txt b/accounts/gmail/CMakeLists.txt
index 78d65572..ae98a20a 100644
--- a/accounts/gmail/CMakeLists.txt
+++ b/accounts/gmail/CMakeLists.txt
@@ -33,8 +33,13 @@ set(SRCS
 )
 
 add_library(gmailaccountplugin SHARED ${SRCS})
-qt5_use_modules(gmailaccountplugin Core Quick Qml)
-target_link_libraries(gmailaccountplugin sink frameworkplugin)
+target_link_libraries(gmailaccountplugin
+    sink
+    frameworkplugin
+    Qt5::Core
+    Qt5::Quick
+    Qt5::Qml
+)
 
 kpackage_install_package(package org.kube.accounts.gmail "genericqml")
 
diff --git a/accounts/imap/CMakeLists.txt b/accounts/imap/CMakeLists.txt
index 13e6e2ec..259c8e69 100644
--- a/accounts/imap/CMakeLists.txt
+++ b/accounts/imap/CMakeLists.txt
@@ -19,7 +19,7 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
 
-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Concurrent Quick Test Gui)
 
 find_package(Sink CONFIG REQUIRED)
 find_package(KAsync CONFIG REQUIRED)
@@ -33,12 +33,22 @@ set(SRCS
 )
 
 add_library(imapaccountplugin SHARED ${SRCS})
-qt5_use_modules(imapaccountplugin Core Quick Qml)
-target_link_libraries(imapaccountplugin sink frameworkplugin)
+target_link_libraries(imapaccountplugin
+    sink
+    frameworkplugin
+    Qt5::Core
+    Qt5::Quick
+    Qt5::Qml
+)
 
 add_library(imapaccount_static STATIC ${SRCS})
-qt5_use_modules(imapaccount_static Core Quick Qml)
-target_link_libraries(imapaccount_static sink frameworkplugin)
+target_link_libraries(imapaccount_static
+    sink
+    frameworkplugin
+    Qt5::Core
+    Qt5::Quick
+    Qt5::Qml
+)
 add_subdirectory(tests)
 
 kpackage_install_package(package org.kube.accounts.imap "genericqml")
diff --git a/accounts/imap/tests/CMakeLists.txt b/accounts/imap/tests/CMakeLists.txt
index 9c914370..82d6059c 100644
--- a/accounts/imap/tests/CMakeLists.txt
+++ b/accounts/imap/tests/CMakeLists.txt
@@ -2,5 +2,10 @@ include_directories(../)
 cmake_policy(SET CMP0063 NEW)
 add_executable(imapsettingstest settingstest.cpp)
 add_test(imapsettingstest settingstest)
-qt5_use_modules(imapsettingstest Core Test Concurrent)
-target_link_libraries(imapsettingstest sink imapaccount_static)
+target_link_libraries(imapsettingstest
+    sink
+    imapaccount_static
+    Qt5::Core
+    Qt5::Concurrent
+    Qt5::Test
+)
diff --git a/accounts/kolabnow/CMakeLists.txt b/accounts/kolabnow/CMakeLists.txt
index 7b181522..8a178bf9 100644
--- a/accounts/kolabnow/CMakeLists.txt
+++ b/accounts/kolabnow/CMakeLists.txt
@@ -33,12 +33,22 @@ set(SRCS
 )
 
 add_library(kolabnowaccountplugin SHARED ${SRCS})
-qt5_use_modules(kolabnowaccountplugin Core Quick Qml)
-target_link_libraries(kolabnowaccountplugin sink frameworkplugin)
+target_link_libraries(kolabnowaccountplugin
+    sink
+    frameworkplugin
+    Qt5::Core
+    Qt5::Quick
+    Qt5::Qml
+)
 
 add_library(kolabnowaccount_static STATIC ${SRCS})
-qt5_use_modules(kolabnowaccount_static Core Quick Qml)
-target_link_libraries(kolabnowaccount_static sink frameworkplugin)
+target_link_libraries(kolabnowaccount_static
+    sink
+    frameworkplugin
+    Qt5::Core
+    Qt5::Quick
+    Qt5::Qml
+)
 # add_subdirectory(tests)
 
 kpackage_install_package(package org.kube.accounts.kolabnow "genericqml")
diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt
index efd0ec6a..b321f0ad 100644
--- a/accounts/maildir/CMakeLists.txt
+++ b/accounts/maildir/CMakeLists.txt
@@ -19,7 +19,7 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
 
-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui)
+find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Concurrent Quick Test Gui)
 
 find_package(Sink CONFIG REQUIRED)
 find_package(KAsync CONFIG REQUIRED)
@@ -33,12 +33,22 @@ set(SRCS
 )
 
 add_library(maildiraccountplugin SHARED ${SRCS})
-qt5_use_modules(maildiraccountplugin Core Quick Qml)
-target_link_libraries(maildiraccountplugin sink frameworkplugin)
+target_link_libraries(maildiraccountplugin
+    sink
+    frameworkplugin
+    Qt5::Core
+    Qt5::Quick
+    Qt5::Qml
+)
 
 add_library(maildiraccount_static STATIC ${SRCS})
-qt5_use_modules(maildiraccount_static Core Quick Qml)
-target_link_libraries(maildiraccount_static sink frameworkplugin)
+target_link_libraries(maildiraccount_static
+    sink
+    frameworkplugin
+    Qt5::Core
+    Qt5::Quick
+    Qt5::Qml
+)
 add_subdirectory(tests)
 
 kpackage_install_package(package org.kube.accounts.maildir "genericqml")
diff --git a/accounts/maildir/tests/CMakeLists.txt b/accounts/maildir/tests/CMakeLists.txt
index cc7651b3..2452e526 100644
--- a/accounts/maildir/tests/CMakeLists.txt
+++ b/accounts/maildir/tests/CMakeLists.txt
@@ -2,5 +2,10 @@ include_directories(../)
 cmake_policy(SET CMP0063 NEW)
 add_executable(settingstest settingstest.cpp)
 add_test(settingstest settingstest)
-qt5_use_modules(settingstest Core Test Concurrent)
-target_link_libraries(settingstest sink maildiraccount_static)
+target_link_libraries(settingstest
+    sink
+    maildiraccount_static
+    Qt5::Core
+    Qt5::Test
+    Qt5::Concurrent
+)
diff --git a/applications/kube/CMakeLists.txt b/applications/kube/CMakeLists.txt
index 498e4895..ed9942c5 100644
--- a/applications/kube/CMakeLists.txt
+++ b/applications/kube/CMakeLists.txt
@@ -40,8 +40,13 @@ if(APPLE OR WIN32)
 endif()
 
 add_executable(${PROJECT_NAME} ${SRCS})
-qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets WebEngine)
-target_link_libraries(${PROJECT_NAME} KF5::Package)
+target_link_libraries(${PROJECT_NAME}
+    Qt5::Gui
+    Qt5::Quick
+    Qt5::Widgets
+    Qt5::WebEngine
+    KF5::Package
+)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
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
+)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e5ff1d72..f18ebc09 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -22,7 +22,13 @@ find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEn
 
 # build testrunner
 add_executable(kubetestrunner kubetestrunner.cpp)
-qt5_use_modules(kubetestrunner Gui Quick Widgets WebEngine QuickTest)
+target_link_libraries(kubetestrunner
+    Qt5::Gui
+    Qt5::Quick
+    Qt5::Widgets
+    Qt5::WebEngine
+    Qt5::QuickTest
+)
 
 # tests
 add_test(NAME qmltests COMMAND kubetestrunner WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})