From 51fbcca97ef9058cdb75c52ac77bdc728a296e4a Mon Sep 17 00:00:00 2001 From: Heiko Becker Date: Fri, 2 Jun 2017 21:35:37 +0200 Subject: 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 --- accounts/imap/CMakeLists.txt | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'accounts/imap/CMakeLists.txt') 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") -- cgit v1.2.3