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. Sink 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: #sink, cmollekopf

Reviewed By: #sink, cmollekopf

Subscribers: #sink

Tags: #sink

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

5 files changed, 18 insertions, 12 deletions

diff --git a/examples/davresource/CMakeLists.txt b/examples/davresource/CMakeLists.txt
index 7091edc..2351ecd 100644
--- a/examples/davresource/CMakeLists.txt
+++ b/examples/davresource/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 find_package(KPimKDAV2 REQUIRED)
 
 add_library(${PROJECT_NAME} SHARED davresource.cpp)
-qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink KPim::KDAV2)
+target_link_libraries(${PROJECT_NAME} sink Qt5::Core Qt5::Network KPim::KDAV2)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
diff --git a/examples/dummyresource/CMakeLists.txt b/examples/dummyresource/CMakeLists.txt
index 2bbaa47..62e96f1 100644
--- a/examples/dummyresource/CMakeLists.txt
+++ b/examples/dummyresource/CMakeLists.txt
@@ -6,7 +6,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(${PROJECT_NAME} SHARED resourcefactory.cpp domainadaptor.cpp dummystore.cpp)
 generate_flatbuffers(${PROJECT_NAME} dummycalendar)
-qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink)
+target_link_libraries(${PROJECT_NAME} sink Qt5::Core Qt5::Network)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
diff --git a/examples/imapresource/CMakeLists.txt b/examples/imapresource/CMakeLists.txt
index 5d2d38b..f5f51f8 100644
--- a/examples/imapresource/CMakeLists.txt
+++ b/examples/imapresource/CMakeLists.txt
@@ -9,8 +9,7 @@ find_package(KIMAP2 0.2 REQUIRED)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(${PROJECT_NAME} SHARED imapresource.cpp imapserverproxy.cpp)
-qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink KF5::Mime KIMAP2)
+target_link_libraries(${PROJECT_NAME} sink Qt5::Core Qt5::Network KF5::Mime KIMAP2)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
 
diff --git a/examples/maildirresource/CMakeLists.txt b/examples/maildirresource/CMakeLists.txt
index a8f0359..690817e 100644
--- a/examples/maildirresource/CMakeLists.txt
+++ b/examples/maildirresource/CMakeLists.txt
@@ -6,8 +6,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 find_package(KF5 COMPONENTS REQUIRED Mime)
 
 add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp libmaildir/maildir.cpp libmaildir/keycache.cpp)
-qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink KF5::Mime)
+target_link_libraries(${PROJECT_NAME} sink Qt5::Core Qt5::Network KF5::Mime)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
 
diff --git a/examples/mailtransportresource/CMakeLists.txt b/examples/mailtransportresource/CMakeLists.txt
index 03b89db..1c34676 100644
--- a/examples/mailtransportresource/CMakeLists.txt
+++ b/examples/mailtransportresource/CMakeLists.txt
@@ -10,13 +10,23 @@ include_directories(${CURL_INCLUDE_DIRS})
 
 
 add_library(${PROJECT_NAME} SHARED mailtransportresource.cpp mailtransport.cpp)
-qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sink KF5::Mime ${CURL_LIBRARIES})
+target_link_libraries(${PROJECT_NAME}
+    sink
+    Qt5::Core
+    Qt5::Network
+    KF5::Mime
+    ${CURL_LIBRARIES}
+)
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
 
 add_executable(sink_smtp_test smtptest.cpp mailtransport.cpp)
-qt5_use_modules(sink_smtp_test Core Network)
-target_link_libraries(sink_smtp_test sink KF5::Mime ${CURL_LIBRARIES})
+target_link_libraries(sink_smtp_test
+    sink
+    Qt5::Core
+    Qt5::Network
+    KF5::Mime
+    ${CURL_LIBRARIES}
+)
 install(TARGETS sink_smtp_test ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
 add_subdirectory(tests)