summaryrefslogtreecommitdiffstats
path: root/framework/src/domain
diff options
context:
space:
mode:
authorHeiko Becker <heirecka@exherbo.org>2017-06-02 21:35:37 +0200
committerHeiko Becker <heirecka@exherbo.org>2017-07-29 11:01:28 +0200
commit51fbcca97ef9058cdb75c52ac77bdc728a296e4a (patch)
tree982206bd7c35353a10839802d237e53692fe7116 /framework/src/domain
parentba32e5a606c77b968f53239caf276456c81b4db7 (diff)
downloadkube-51fbcca97ef9058cdb75c52ac77bdc728a296e4a.tar.gz
kube-51fbcca97ef9058cdb75c52ac77bdc728a296e4a.zip
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
Diffstat (limited to 'framework/src/domain')
-rw-r--r--framework/src/domain/mime/mimetreeparser/tests/CMakeLists.txt8
-rw-r--r--framework/src/domain/settings/CMakeLists.txt11
2 files changed, 15 insertions, 4 deletions
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)
10 10
11add_executable(mimetreeparsertest interfacetest.cpp) 11add_executable(mimetreeparsertest interfacetest.cpp)
12add_gpg_crypto_test(mimetreeparsertest mimetreeparsertest) 12add_gpg_crypto_test(mimetreeparsertest mimetreeparsertest)
13qt5_use_modules(mimetreeparsertest Core Test) 13target_link_libraries(mimetreeparsertest
14target_link_libraries(mimetreeparsertest KF5::Mime kube_otp) 14 kube_otp
15 Qt5::Core
16 Qt5::Test
17 KF5::Mime
18)
15 19
16find_package(Gpgmepp 1.7.1 CONFIG) 20find_package(Gpgmepp 1.7.1 CONFIG)
17find_package(QGpgme 1.7.1 CONFIG) 21find_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})
2cmake_policy(SET CMP0063 NEW) 2cmake_policy(SET CMP0063 NEW)
3add_executable(sinkactiontest sinkactiontest.cpp) 3add_executable(sinkactiontest sinkactiontest.cpp)
4add_test(sinkactiontest sinkactiontest) 4add_test(sinkactiontest sinkactiontest)
5qt5_use_modules(sinkactiontest Core Test Concurrent) 5target_link_libraries(sinkactiontest
6target_link_libraries(sinkactiontest sink actionplugin KF5::Mime mailplugin) 6 sink
7 actionplugin
8 mailplugin
9 Qt5::Core
10 Qt5::Concurrent
11 Qt5::Test
12 KF5::Mime
13)