diff --git a/about-distro/src/CMakeLists.txt b/about-distro/src/CMakeLists.txt
index dc66c67c..6d0ba544 100644
--- a/about-distro/src/CMakeLists.txt
+++ b/about-distro/src/CMakeLists.txt
@@ -16,9 +16,9 @@ set_source_files_properties(
 kde4_add_plugin(kcm_about_distro ${kcm_SRCS})
 
 target_link_libraries(kcm_about_distro
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDE4_SOLID_LIBS}
+    KDE4::kdeui
+    KDE4::kio
+    KDE4::solid
 )
 
 install(
diff --git a/ark/app/CMakeLists.txt b/ark/app/CMakeLists.txt
index 4ac4aa52..d36c06b0 100644
--- a/ark/app/CMakeLists.txt
+++ b/ark/app/CMakeLists.txt
@@ -9,8 +9,8 @@ set(ark_SRCS
 add_executable(ark ${ark_SRCS})
 
 target_link_libraries(ark
-    ${KDE4_KFILE_LIBS}
-    ${KDE4_KPARTS_LIBS}
+    KDE4::kfile
+    KDE4::kparts
     kerfuffle
 )
 
@@ -57,9 +57,9 @@ if (KDE4WORKSPACE_FOUND)
 
     target_link_libraries(ark_dndextract
         kerfuffle
-        ${KDE4_KDECORE_LIBS}
-        ${KDE4_KPARTS_LIBS}
-        ${KDE4_KFILE_LIBS}
+        KDE4::kdecore
+        KDE4::kparts
+        KDE4::kfile
         ${KDE4WORKSPACE_KONQ_LIBRARY}
     )
 
diff --git a/ark/kerfuffle/CMakeLists.txt b/ark/kerfuffle/CMakeLists.txt
index d5eea2cd..dfc86e23 100644
--- a/ark/kerfuffle/CMakeLists.txt
+++ b/ark/kerfuffle/CMakeLists.txt
@@ -16,9 +16,9 @@ kde4_add_kcfg_files(kerfuffle_SRCS settings.kcfgc)
 
 add_library(kerfuffle SHARED ${kerfuffle_SRCS})
 target_link_libraries(kerfuffle
-    ${KDE4_KFILE_LIBS}
-    ${KDE4_KPARTS_LIBS}
-    ${KDE4_KPTY_LIBS}
+    KDE4::kfile
+    KDE4::kparts
+    KDE4::kpty
 )
 
 set_target_properties(kerfuffle PROPERTIES
diff --git a/ark/kerfuffle/tests/CMakeLists.txt b/ark/kerfuffle/tests/CMakeLists.txt
index 798bdf68..56cdb253 100644
--- a/ark/kerfuffle/tests/CMakeLists.txt
+++ b/ark/kerfuffle/tests/CMakeLists.txt
@@ -12,7 +12,7 @@ macro(KERFUFFLE_UNIT_TESTS)
         target_link_libraries(kerfuffle-${_testname}
             jsoninterface
             kerfuffle
-            ${KDE4_KDEUI_LIBS}
+            KDE4::kdeui
             ${QT_QTTEST_LIBRARY}
         )
     endforeach(_testname)
diff --git a/ark/part/CMakeLists.txt b/ark/part/CMakeLists.txt
index e3df0a1d..424527de 100644
--- a/ark/part/CMakeLists.txt
+++ b/ark/part/CMakeLists.txt
@@ -11,7 +11,7 @@ qt4_add_dbus_adaptor(arkpart_PART_SRCS dnddbusinterface.xml part.h Ark::Part)
 
 kde4_add_plugin(arkpart ${arkpart_PART_SRCS})
 
-target_link_libraries(arkpart kerfuffle ${KDE4_KFILE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEUI_LIBS})
+target_link_libraries(arkpart kerfuffle KDE4::kfile KDE4::kparts KDE4::kdeui)
 
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/ark_part.desktop.cmake
diff --git a/ark/plugins/libarchive/CMakeLists.txt b/ark/plugins/libarchive/CMakeLists.txt
index 611fd7cb..8c9e1428 100644
--- a/ark/plugins/libarchive/CMakeLists.txt
+++ b/ark/plugins/libarchive/CMakeLists.txt
@@ -32,7 +32,7 @@ set(kerfuffle_libarchive_SRCS libarchivehandler.cpp)
 
 kde4_add_plugin(kerfuffle_libarchive ${kerfuffle_libarchive_SRCS})
 
-target_link_libraries(kerfuffle_libarchive ${KDE4_KDECORE_LIBS} ${KDE4_KARCHIVE_LIBS} kerfuffle)
+target_link_libraries(kerfuffle_libarchive KDE4::kdecore KDE4::karchive kerfuffle)
 
 install(TARGETS kerfuffle_libarchive  DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} )
 
diff --git a/ark/plugins/libsinglefileplugin/CMakeLists.txt b/ark/plugins/libsinglefileplugin/CMakeLists.txt
index 6cb91f5a..b510b02f 100644
--- a/ark/plugins/libsinglefileplugin/CMakeLists.txt
+++ b/ark/plugins/libsinglefileplugin/CMakeLists.txt
@@ -17,8 +17,8 @@ if (LIBDEFLATE_FOUND)
     kde4_add_plugin(kerfuffle_libgz ${kerfuffle_libgz_SRCS})
 
     target_link_libraries(kerfuffle_libgz
-        ${KDE4_KDECORE_LIBS}
-        ${KDE4_KARCHIVE_LIBS}
+        KDE4::kdecore
+        KDE4::karchive
         kerfuffle
     )
 
@@ -45,8 +45,8 @@ if (BZIP2_FOUND)
     kde4_add_plugin(kerfuffle_libbz2 ${kerfuffle_libbz2_SRCS})
 
     target_link_libraries(kerfuffle_libbz2
-        ${KDE4_KDECORE_LIBS}
-        ${KDE4_KARCHIVE_LIBS}
+        KDE4::kdecore
+        KDE4::karchive
         kerfuffle
     )
 
@@ -72,8 +72,8 @@ if (LIBLZMA_FOUND)
     kde4_add_plugin(kerfuffle_libxz ${kerfuffle_libxz_SRCS})
 
     target_link_libraries(kerfuffle_libxz
-        ${KDE4_KDECORE_LIBS}
-        ${KDE4_KARCHIVE_LIBS}
+        KDE4::kdecore
+        KDE4::karchive
         kerfuffle
     )
 
diff --git a/filelight/src/app/CMakeLists.txt b/filelight/src/app/CMakeLists.txt
index c23ebdd7..2cef40d4 100644
--- a/filelight/src/app/CMakeLists.txt
+++ b/filelight/src/app/CMakeLists.txt
@@ -23,9 +23,9 @@ set(filelight_SRCS historyAction.cpp mainWindow.cpp main.cpp)
 add_executable(filelight ${filelight_SRCS})
 
 target_link_libraries(filelight
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KPARTS_LIBS}
-    ${KDE4_KDEUI_LIBS}
+    KDE4::kdecore
+    KDE4::kparts
+    KDE4::kdeui
 )
 
 install(
diff --git a/filelight/src/part/CMakeLists.txt b/filelight/src/part/CMakeLists.txt
index 070cbfef..ca436839 100644
--- a/filelight/src/part/CMakeLists.txt
+++ b/filelight/src/part/CMakeLists.txt
@@ -39,12 +39,12 @@ set(filelight_PART_SRCS
 kde4_add_plugin(filelightpart ${filelight_PART_SRCS})
 
 target_link_libraries(filelightpart
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KPARTS_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDE4_KFILE_LIBS}
-    ${KDE4_SOLID_LIBS}
+    KDE4::kdecore
+    KDE4::kparts
+    KDE4::kdeui
+    KDE4::kio
+    KDE4::kfile
+    KDE4::solid
 )
 
 install(
diff --git a/gwenview/app/CMakeLists.txt b/gwenview/app/CMakeLists.txt
index 49a4fd20..68f0eca5 100644
--- a/gwenview/app/CMakeLists.txt
+++ b/gwenview/app/CMakeLists.txt
@@ -38,8 +38,8 @@ set(gwenview_SRCS
 add_executable(gwenview ${gwenview_SRCS})
 
 target_link_libraries(gwenview
-    ${KDE4_KFILE_LIBS}
-    ${KDE4_KIO_LIBS}
+    KDE4::kfile
+    KDE4::kio
     ${KDE4WORKSPACE_KONQ_LIBRARY}
     ${QT_QTCORE_LIBRARY}
     gwenviewlib
diff --git a/gwenview/importer/CMakeLists.txt b/gwenview/importer/CMakeLists.txt
index 235696f2..4ab6e1e2 100644
--- a/gwenview/importer/CMakeLists.txt
+++ b/gwenview/importer/CMakeLists.txt
@@ -27,9 +27,9 @@ kde4_add_kcfg_files(importer_SRCS importerconfig.kcfgc)
 
 add_executable(gwenview_importer ${importer_SRCS})
 target_link_libraries(gwenview_importer
-    ${KDE4_KFILE_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDE4_SOLID_LIBS}
+    KDE4::kfile
+    KDE4::kio
+    KDE4::solid
     ${QT_QTCORE_LIBRARY}
     gwenviewlib
 )
diff --git a/gwenview/lib/CMakeLists.txt b/gwenview/lib/CMakeLists.txt
index a480fc39..0c4d395f 100644
--- a/gwenview/lib/CMakeLists.txt
+++ b/gwenview/lib/CMakeLists.txt
@@ -111,9 +111,9 @@ set_target_properties(gwenviewlib PROPERTIES
 generate_export_header(gwenviewlib)
 
 target_link_libraries(gwenviewlib
-    ${KDE4_KFILE_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDE4_KEXIV2_LIBS}
+    KDE4::kfile
+    KDE4::kio
+    KDE4::kexiv2
     ${QT_QTGUI_LIBRARY}
     ${X11_X11_LIB}
     ${CMAKE_THREAD_LIBS_INIT}
diff --git a/gwenview/part/CMakeLists.txt b/gwenview/part/CMakeLists.txt
index d5b13b2c..baf3f7a6 100644
--- a/gwenview/part/CMakeLists.txt
+++ b/gwenview/part/CMakeLists.txt
@@ -9,7 +9,7 @@ set(gvpart_SRCS
 
 kde4_add_plugin(gvpart ${gvpart_SRCS})
 
-target_link_libraries(gvpart ${KDE4_KPARTS_LIBS} gwenviewlib)
+target_link_libraries(gvpart KDE4::kparts gwenviewlib)
 
 install(
     TARGETS gvpart
diff --git a/gwenview/tests/auto/CMakeLists.txt b/gwenview/tests/auto/CMakeLists.txt
index 6bd69e43..18bf57ae 100644
--- a/gwenview/tests/auto/CMakeLists.txt
+++ b/gwenview/tests/auto/CMakeLists.txt
@@ -1,9 +1,9 @@
 macro(gv_add_unit_test _test)
     kde4_add_test(${_test} ${_test}.cpp ${ARGN})
     target_link_libraries(${_test}
-        ${KDE4_KIO_LIBS}
-        ${KDE4_KDEUI_LIBS}
-        ${KDE4_KDECORE_LIBS}
+        KDE4::kio
+        KDE4::kdeui
+        KDE4::kdecore
         ${QT_QTTEST_LIBRARY}
         ${QT_QTCORE_LIBRARY}
         ${QT_QTGUI_LIBRARY}
diff --git a/kcalc/CMakeLists.txt b/kcalc/CMakeLists.txt
index e84b8f5d..06db586e 100644
--- a/kcalc/CMakeLists.txt
+++ b/kcalc/CMakeLists.txt
@@ -72,7 +72,7 @@ kde4_add_kcfg_files(kcalc_SRCS kcalc_settings.kcfgc)
 add_executable(kcalc ${kcalc_SRCS})
 
 target_link_libraries(kcalc
-    ${KDE4_KDEUI_LIBS}
+    KDE4::kdeui
     ${QT_QTXML_LIBRARY}
     ${GMP_LIBRARIES}
 )
diff --git a/kcalc/knumber/tests/CMakeLists.txt b/kcalc/knumber/tests/CMakeLists.txt
index f879a4f2..3f46f31c 100644
--- a/kcalc/knumber/tests/CMakeLists.txt
+++ b/kcalc/knumber/tests/CMakeLists.txt
@@ -4,4 +4,4 @@ set(knumbertest_SRCS knumbertest.cpp ${libknumber_la_SRCS})
 
 kde4_add_test(knumber-KNumber ${knumbertest_SRCS})
 
-target_link_libraries(knumber-KNumber ${KDE4_KDECORE_LIBS} ${GMP_LIBRARIES})
+target_link_libraries(knumber-KNumber KDE4::kdecore ${GMP_LIBRARIES})
diff --git a/kcolorchooser/CMakeLists.txt b/kcolorchooser/CMakeLists.txt
index c74c51ed..b7cfcdde 100644
--- a/kcolorchooser/CMakeLists.txt
+++ b/kcolorchooser/CMakeLists.txt
@@ -19,7 +19,7 @@ set(kcolorchooser_SRCS kcolorchooser.cpp)
 
 add_executable(kcolorchooser ${kcolorchooser_SRCS})
 
-target_link_libraries(kcolorchooser ${KDE4_KDEUI_LIBS})
+target_link_libraries(kcolorchooser KDE4::kdeui)
 
 install(
     TARGETS kcolorchooser
diff --git a/kdeplasma-addons/applets/bball/CMakeLists.txt b/kdeplasma-addons/applets/bball/CMakeLists.txt
index f2a46bf0..d20d1b3a 100644
--- a/kdeplasma-addons/applets/bball/CMakeLists.txt
+++ b/kdeplasma-addons/applets/bball/CMakeLists.txt
@@ -5,9 +5,9 @@ set(bball_SRCS bball.cpp bballConfig.ui)
 kde4_add_plugin(plasma_applet_bball ${bball_SRCS})
 
 target_link_libraries(plasma_applet_bball
-    ${KDE4_PLASMA_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KIO_LIBS}
+    KDE4::plasma
+    KDE4::kdeui
+    KDE4::kio
 )
 
 install(
diff --git a/kdeplasma-addons/applets/binary-clock/CMakeLists.txt b/kdeplasma-addons/applets/binary-clock/CMakeLists.txt
index 4839a4d4..cd8686aa 100644
--- a/kdeplasma-addons/applets/binary-clock/CMakeLists.txt
+++ b/kdeplasma-addons/applets/binary-clock/CMakeLists.txt
@@ -4,7 +4,7 @@ set(binaryclock_SRCS binaryclock.cpp clockConfig.ui)
 
 kde4_add_plugin(plasma_applet_binaryclock ${binaryclock_SRCS})
 
-target_link_libraries(plasma_applet_binaryclock ${KDE4WORKSPACE_PLASMACLOCK_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+target_link_libraries(plasma_applet_binaryclock ${KDE4WORKSPACE_PLASMACLOCK_LIBRARY} KDE4::plasma KDE4::kdeui)
 
 install(TARGETS plasma_applet_binaryclock DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
diff --git a/kdeplasma-addons/applets/blackboard/CMakeLists.txt b/kdeplasma-addons/applets/blackboard/CMakeLists.txt
index 97e10413..65e88234 100644
--- a/kdeplasma-addons/applets/blackboard/CMakeLists.txt
+++ b/kdeplasma-addons/applets/blackboard/CMakeLists.txt
@@ -15,7 +15,7 @@ set(blackboard_SRCS blackboard.cpp blackboardwidget.cpp)
 # Now make sure all files get to the right place
 kde4_add_plugin(plasma_applet_blackboard ${blackboard_SRCS})
 target_link_libraries(plasma_applet_blackboard
-                      ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
+                      KDE4::plasma KDE4::kdeui KDE4::kio)
 
 install(TARGETS plasma_applet_blackboard
         DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/bookmarks/CMakeLists.txt b/kdeplasma-addons/applets/bookmarks/CMakeLists.txt
index f2b247cb..3c461829 100644
--- a/kdeplasma-addons/applets/bookmarks/CMakeLists.txt
+++ b/kdeplasma-addons/applets/bookmarks/CMakeLists.txt
@@ -9,9 +9,9 @@ set( bookmarks_SRCS
 kde4_add_plugin( plasma_applet_bookmarks  ${bookmarks_SRCS})
 
 target_link_libraries( plasma_applet_bookmarks
-    ${KDE4_PLASMA_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KIO_LIBS}
+    KDE4::plasma
+    KDE4::kdeui
+    KDE4::kio
 )
 
 install( TARGETS plasma_applet_bookmarks  DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt b/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt
index 076f7d69..3026480c 100644
--- a/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt
+++ b/kdeplasma-addons/applets/bubblemon/src/CMakeLists.txt
@@ -4,6 +4,6 @@ set(bubblemon_SRCS
 )
 
 kde4_add_plugin(plasma_applet_bubblemon ${bubblemon_SRCS})
-target_link_libraries(plasma_applet_bubblemon ${KDE4_PLASMA_LIBS})
+target_link_libraries(plasma_applet_bubblemon KDE4::plasma)
 
 install(TARGETS plasma_applet_bubblemon DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/dict/CMakeLists.txt b/kdeplasma-addons/applets/dict/CMakeLists.txt
index 07d1f462..27fbe38b 100644
--- a/kdeplasma-addons/applets/dict/CMakeLists.txt
+++ b/kdeplasma-addons/applets/dict/CMakeLists.txt
@@ -6,8 +6,8 @@ set(dict_SRCS
 
 kde4_add_plugin(plasma_applet_dict ${dict_SRCS})
 target_link_libraries(plasma_applet_dict
-    ${KDE4_PLASMA_LIBS}
-    ${KDE4_KDEUI_LIBS}
+    KDE4::plasma
+    KDE4::kdeui
 )
 
 install(
diff --git a/kdeplasma-addons/applets/eyes/CMakeLists.txt b/kdeplasma-addons/applets/eyes/CMakeLists.txt
index b27d4c30..6ab958b7 100644
--- a/kdeplasma-addons/applets/eyes/CMakeLists.txt
+++ b/kdeplasma-addons/applets/eyes/CMakeLists.txt
@@ -5,7 +5,7 @@ set(eyes_SRCS eyes.cpp)
 
 kde4_add_plugin(plasma_applet_eyes ${eyes_SRCS})
 target_link_libraries(plasma_applet_eyes
-                      ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+                      KDE4::plasma KDE4::kdeui)
  
 install(TARGETS plasma_applet_eyes
         DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt b/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt
index bb1787eb..2a79631f 100644
--- a/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt
+++ b/kdeplasma-addons/applets/fifteenPuzzle/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories( ${KDE4_INCLUDES} )
 set(fifteenPuzzle_SRCS src/fifteenPuzzle.cpp src/fifteen.cpp src/piece.cpp src/fifteenPuzzleConfig.ui )
 kde4_add_plugin(plasma_applet_fifteenPuzzle ${fifteenPuzzle_SRCS})
 
-target_link_libraries(plasma_applet_fifteenPuzzle ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(plasma_applet_fifteenPuzzle KDE4::plasma KDE4::kio)
 
 
 install(TARGETS plasma_applet_fifteenPuzzle DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt b/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt
index 78cf5079..fcf11230 100644
--- a/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt
+++ b/kdeplasma-addons/applets/fileWatcher/CMakeLists.txt
@@ -10,7 +10,7 @@ set(fileWatcher_SRCS
 
 kde4_add_plugin(plasma_applet_fileWatcher ${fileWatcher_SRCS})
 
-target_link_libraries(plasma_applet_fileWatcher ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(plasma_applet_fileWatcher KDE4::plasma KDE4::kio)
 
 install(TARGETS plasma_applet_fileWatcher DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-fileWatcher-default.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/frame/CMakeLists.txt b/kdeplasma-addons/applets/frame/CMakeLists.txt
index 5d05f26b..8d742021 100644
--- a/kdeplasma-addons/applets/frame/CMakeLists.txt
+++ b/kdeplasma-addons/applets/frame/CMakeLists.txt
@@ -13,10 +13,10 @@ kde4_add_plugin(plasma_applet_frame ${frame_SRCS})
 
 include_directories(${KEXIV2_INCLUDE_DIR})
 target_link_libraries(plasma_applet_frame
-    ${KDE4_PLASMA_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDE4_KFILE_LIBS}
-    ${KDE4_KEXIV2_LIBS}
+    KDE4::plasma
+    KDE4::kio
+    KDE4::kfile
+    KDE4::kexiv2
 )
 
 install(TARGETS plasma_applet_frame DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt b/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt
index b734cc60..9ccda5f9 100644
--- a/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt
+++ b/kdeplasma-addons/applets/fuzzy-clock/CMakeLists.txt
@@ -3,7 +3,7 @@ project(fuzzy-clock)
 set(fuzzyclock_SRCS fuzzyClock.cpp fuzzyClockConfig.ui )
 
 kde4_add_plugin(plasma_applet_fuzzy_clock ${fuzzyclock_SRCS})
-target_link_libraries(plasma_applet_fuzzy_clock ${KDE4WORKSPACE_PLASMACLOCK_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+target_link_libraries(plasma_applet_fuzzy_clock ${KDE4WORKSPACE_PLASMACLOCK_LIBRARY} KDE4::plasma KDE4::kdeui)
 
 install(TARGETS plasma_applet_fuzzy_clock DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
diff --git a/kdeplasma-addons/applets/icontasks/CMakeLists.txt b/kdeplasma-addons/applets/icontasks/CMakeLists.txt
index 774451ae..809eca14 100644
--- a/kdeplasma-addons/applets/icontasks/CMakeLists.txt
+++ b/kdeplasma-addons/applets/icontasks/CMakeLists.txt
@@ -25,9 +25,9 @@ qt4_add_dbus_interface(tasks_SRCS org.freedesktop.MediaPlayer.player.xml playerv
 kde4_add_plugin(plasma_applet_icontasks ${tasks_SRCS})
 
 target_link_libraries(plasma_applet_icontasks
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_PLASMA_LIBS}
-    ${KDE4_KIO_LIBS}
+    KDE4::kdeui
+    KDE4::plasma
+    KDE4::kio
     ${KDE4WORKSPACE_TASKMANAGER_LIBS}
 )
 
diff --git a/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt b/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt
index 0493b3c7..9678a708 100644
--- a/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt
+++ b/kdeplasma-addons/applets/incomingmsg/CMakeLists.txt
@@ -6,7 +6,7 @@ set(incomingmsg_SRCS incomingmsg.cpp widget.ui)
 kde4_add_plugin(plasma_applet_incomingmsg ${incomingmsg_SRCS})
 
 target_link_libraries(plasma_applet_incomingmsg
-                      ${QT_QTNETWORK_LIBRARY} ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+                      ${QT_QTNETWORK_LIBRARY} KDE4::plasma KDE4::kdeui)
 
 install(TARGETS plasma_applet_incomingmsg
         DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/kolourpicker/CMakeLists.txt b/kdeplasma-addons/applets/kolourpicker/CMakeLists.txt
index 0cf00b08..0d4ded1f 100644
--- a/kdeplasma-addons/applets/kolourpicker/CMakeLists.txt
+++ b/kdeplasma-addons/applets/kolourpicker/CMakeLists.txt
@@ -16,7 +16,7 @@ set(kolourpicker_SRCS
 )
 
 kde4_add_plugin(plasma_applet_kolourpicker ${kolourpicker_SRCS})
-target_link_libraries(plasma_applet_kolourpicker ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(plasma_applet_kolourpicker KDE4::plasma KDE4::kio)
 if(KOLOURPICKER_X11_LIB)
    target_link_libraries(plasma_applet_kolourpicker ${X11_X11_LIB})
 endif(KOLOURPICKER_X11_LIB)
diff --git a/kdeplasma-addons/applets/life/CMakeLists.txt b/kdeplasma-addons/applets/life/CMakeLists.txt
index 9a94e1e9..f02c6eca 100644
--- a/kdeplasma-addons/applets/life/CMakeLists.txt
+++ b/kdeplasma-addons/applets/life/CMakeLists.txt
@@ -3,7 +3,7 @@ project(life)
 set(life_SRCS life.cpp lifeConfig.ui)
 kde4_add_plugin(plasma_applet_life ${life_SRCS})
 target_link_libraries(plasma_applet_life
-                      ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+                      KDE4::plasma KDE4::kdeui)
  
 install(TARGETS plasma_applet_life
         DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/luna/CMakeLists.txt b/kdeplasma-addons/applets/luna/CMakeLists.txt
index 26ce6137..1ee2f378 100644
--- a/kdeplasma-addons/applets/luna/CMakeLists.txt
+++ b/kdeplasma-addons/applets/luna/CMakeLists.txt
@@ -3,7 +3,7 @@ project(luna)
 set(luna_SRCS luna.cpp lunaConfig.ui)
 kde4_add_plugin(plasma_applet_luna ${luna_SRCS})
 target_link_libraries(plasma_applet_luna
-                      ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+                      KDE4::plasma KDE4::kdeui)
  
 install(TARGETS plasma_applet_luna
         DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/magnifique/CMakeLists.txt b/kdeplasma-addons/applets/magnifique/CMakeLists.txt
index f885b70a..c0a0ecd1 100644
--- a/kdeplasma-addons/applets/magnifique/CMakeLists.txt
+++ b/kdeplasma-addons/applets/magnifique/CMakeLists.txt
@@ -7,7 +7,7 @@ set(magnifique_SRCS magnifique.cpp)
 # Now make sure all files get to the right place
 kde4_add_plugin(plasma_applet_magnifique ${magnifique_SRCS})
 target_link_libraries(plasma_applet_magnifique 
-                      ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+                      KDE4::plasma KDE4::kdeui)
  
 install(TARGETS plasma_applet_magnifique
         DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/notes/CMakeLists.txt b/kdeplasma-addons/applets/notes/CMakeLists.txt
index 2ad81f33..0fd9c526 100644
--- a/kdeplasma-addons/applets/notes/CMakeLists.txt
+++ b/kdeplasma-addons/applets/notes/CMakeLists.txt
@@ -11,7 +11,7 @@ set(notes_SRCS notes.cpp textedit.cpp config.ui)
 
 kde4_add_plugin(plasma_applet_notes ${notes_SRCS})
 target_link_libraries(plasma_applet_notes
-            ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS}
+            KDE4::plasma KDE4::kio
             )
 install(
     TARGETS plasma_applet_notes
diff --git a/kdeplasma-addons/applets/paste/CMakeLists.txt b/kdeplasma-addons/applets/paste/CMakeLists.txt
index 18d4a199..ec2a59ca 100644
--- a/kdeplasma-addons/applets/paste/CMakeLists.txt
+++ b/kdeplasma-addons/applets/paste/CMakeLists.txt
@@ -18,7 +18,7 @@ set(paste_SRCS
 
 kde4_add_plugin(plasma_applet_paste ${paste_SRCS})
 target_link_libraries(plasma_applet_paste
-        ${X11_X11_LIB} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
+        ${X11_X11_LIB} KDE4::kdeui KDE4::kio KDE4::plasma)
 
 install(TARGETS plasma_applet_paste DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-paste.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/qalculate/CMakeLists.txt b/kdeplasma-addons/applets/qalculate/CMakeLists.txt
index 23d42766..d9ed5bac 100644
--- a/kdeplasma-addons/applets/qalculate/CMakeLists.txt
+++ b/kdeplasma-addons/applets/qalculate/CMakeLists.txt
@@ -18,10 +18,10 @@ set(qalculate_SRCS
 # Now make sure all files get to the right place
 kde4_add_plugin(plasma_applet_qalculate ${qalculate_SRCS})
 target_link_libraries(plasma_applet_qalculate 
-    ${KDE4_PLASMA_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_SOLID_LIBS}
-    ${KDE4_KIO_LIBS}
+    KDE4::plasma
+    KDE4::kdeui
+    KDE4::solid
+    KDE4::kio
     ${QALCULATE_LIBRARIES}
 )
  
diff --git a/kdeplasma-addons/applets/showdesktop/CMakeLists.txt b/kdeplasma-addons/applets/showdesktop/CMakeLists.txt
index 99bebcdc..e8927da1 100644
--- a/kdeplasma-addons/applets/showdesktop/CMakeLists.txt
+++ b/kdeplasma-addons/applets/showdesktop/CMakeLists.txt
@@ -7,7 +7,7 @@ set(showdesktop_SRCS
 
 kde4_add_plugin(plasma_applet_showdesktop ${showdesktop_SRCS})
 target_link_libraries(plasma_applet_showdesktop
-     ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} )
+     KDE4::kdeui KDE4::plasma )
 
 install(TARGETS plasma_applet_showdesktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-showdesktop.desktop
diff --git a/kdeplasma-addons/applets/spellcheck/CMakeLists.txt b/kdeplasma-addons/applets/spellcheck/CMakeLists.txt
index c648171b..74538a17 100644
--- a/kdeplasma-addons/applets/spellcheck/CMakeLists.txt
+++ b/kdeplasma-addons/applets/spellcheck/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(spellcheck_SRCS SpellCheck.cpp)
 
 kde4_add_plugin(plasma_applet_spellcheck ${spellcheck_SRCS})
-target_link_libraries(plasma_applet_spellcheck ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS})
+target_link_libraries(plasma_applet_spellcheck KDE4::plasma KDE4::kdeui KDE4::kcmutils)
 
 install(TARGETS plasma_applet_spellcheck DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-applet-spellcheck.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt b/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt
index bedf3f59..2f5a9711 100644
--- a/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt
+++ b/kdeplasma-addons/applets/systemloadviewer/CMakeLists.txt
@@ -8,7 +8,7 @@ set(systemloadviewer_SRCS
 
 kde4_add_plugin(plasma-applet_systemloadviewer ${systemloadviewer_SRCS})
 target_link_libraries(plasma-applet_systemloadviewer
-                      ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+                      KDE4::plasma KDE4::kdeui)
 
 install(TARGETS plasma-applet_systemloadviewer
         DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/timer/CMakeLists.txt b/kdeplasma-addons/applets/timer/CMakeLists.txt
index ea8a0d70..ab369ed8 100644
--- a/kdeplasma-addons/applets/timer/CMakeLists.txt
+++ b/kdeplasma-addons/applets/timer/CMakeLists.txt
@@ -14,7 +14,7 @@ set(timer_SRCS
 # Now make sure all files get to the right place
 kde4_add_plugin(plasma_applet_timer ${timer_SRCS})
 target_link_libraries(plasma_applet_timer
-                      ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+                      KDE4::plasma KDE4::kdeui)
 
 install(TARGETS plasma_applet_timer
         DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/applets/unitconverter/CMakeLists.txt b/kdeplasma-addons/applets/unitconverter/CMakeLists.txt
index 1ee1e42e..2a50f3de 100644
--- a/kdeplasma-addons/applets/unitconverter/CMakeLists.txt
+++ b/kdeplasma-addons/applets/unitconverter/CMakeLists.txt
@@ -14,8 +14,8 @@ set(unitconverter_SRCS unitconverter.cpp)
 # Now make sure all files get to the right place
 kde4_add_plugin(plasma_applet_unitconverter ${unitconverter_SRCS})
 target_link_libraries(plasma_applet_unitconverter
-    ${KDE4_PLASMA_LIBS}
-    ${KDE4_KDEUI_LIBS}
+    KDE4::plasma
+    KDE4::kdeui
 )
 
 install(
diff --git a/kdeplasma-addons/applets/weather/CMakeLists.txt b/kdeplasma-addons/applets/weather/CMakeLists.txt
index 891deb2c..b9ea755e 100644
--- a/kdeplasma-addons/applets/weather/CMakeLists.txt
+++ b/kdeplasma-addons/applets/weather/CMakeLists.txt
@@ -10,9 +10,9 @@ set(weatherapplet_SRCS
 
 kde4_add_plugin(plasma_applet_weather ${weatherapplet_SRCS})
 target_link_libraries(plasma_applet_weather
-    ${KDE4_PLASMA_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDE4_KDEUI_LIBS}
+    KDE4::plasma
+    KDE4::kio
+    KDE4::kdeui
     ${KDE4WORKSPACE_WEATHERION_LIBRARY}
     ${QT_QTDECLARATIVE_LIBRARY}
     plasmaweather
diff --git a/kdeplasma-addons/applets/weatherstation/CMakeLists.txt b/kdeplasma-addons/applets/weatherstation/CMakeLists.txt
index 974d193d..d27d28cf 100644
--- a/kdeplasma-addons/applets/weatherstation/CMakeLists.txt
+++ b/kdeplasma-addons/applets/weatherstation/CMakeLists.txt
@@ -13,10 +13,10 @@ set(weatherstation_SRCS
 
 kde4_add_plugin(plasma_applet_weatherstation ${weatherstation_SRCS})
 target_link_libraries(plasma_applet_weatherstation
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDE4_PLASMA_LIBS}
-    ${KDE4_KARCHIVE_LIBS}
+    KDE4::kdeui
+    KDE4::kio
+    KDE4::plasma
+    KDE4::karchive
     ${KDE4WORKSPACE_WEATHERION_LIBRARY}
     ${QT_QTDECLARATIVE_LIBRARY}
     plasmaweather
diff --git a/kdeplasma-addons/containments/groupingdesktop/desktop/CMakeLists.txt b/kdeplasma-addons/containments/groupingdesktop/desktop/CMakeLists.txt
index 43b76f4a..72937380 100644
--- a/kdeplasma-addons/containments/groupingdesktop/desktop/CMakeLists.txt
+++ b/kdeplasma-addons/containments/groupingdesktop/desktop/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(groupingdesktop_SRCS groupingdesktop.cpp)
 
 kde4_add_plugin(plasma_containment_groupingdesktop ${groupingdesktop_SRCS})
-target_link_libraries(plasma_containment_groupingdesktop ${KDE4_PLASMA_LIBS} plasma_groupingcontainment)
+target_link_libraries(plasma_containment_groupingdesktop KDE4::plasma plasma_groupingcontainment)
 
 install(TARGETS plasma_containment_groupingdesktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-containment-groupingdesktop.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
\ No newline at end of file
diff --git a/kdeplasma-addons/containments/groupingdesktop/griddesktop/CMakeLists.txt b/kdeplasma-addons/containments/groupingdesktop/griddesktop/CMakeLists.txt
index 0377a3e0..b01ceeb6 100644
--- a/kdeplasma-addons/containments/groupingdesktop/griddesktop/CMakeLists.txt
+++ b/kdeplasma-addons/containments/groupingdesktop/griddesktop/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(griddesktop_SRCS griddesktop.cpp)
 
 kde4_add_plugin(plasma_containment_griddesktop ${griddesktop_SRCS})
-target_link_libraries(plasma_containment_griddesktop ${KDE4_PLASMA_LIBS} plasma_groupingcontainment)
+target_link_libraries(plasma_containment_griddesktop KDE4::plasma plasma_groupingcontainment)
 
 install(TARGETS plasma_containment_griddesktop DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-containment-griddesktop.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
\ No newline at end of file
diff --git a/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt b/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt
index 8a863880..d4fdf7bc 100644
--- a/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt
+++ b/kdeplasma-addons/containments/groupingdesktop/lib/CMakeLists.txt
@@ -24,7 +24,7 @@ set(groupingcontainment_SRCS
     groups/tabbinggroup_config.ui
 )
 add_library(plasma_groupingcontainment SHARED ${groupingcontainment_SRCS})
-target_link_libraries(plasma_groupingcontainment ${KDE4_PLASMA_LIBS})
+target_link_libraries(plasma_groupingcontainment KDE4::plasma)
 
 generate_export_header(plasma_groupingcontainment)
 
diff --git a/kdeplasma-addons/containments/groupingdesktop/panel/CMakeLists.txt b/kdeplasma-addons/containments/groupingdesktop/panel/CMakeLists.txt
index fdd46d7a..e64ab74a 100644
--- a/kdeplasma-addons/containments/groupingdesktop/panel/CMakeLists.txt
+++ b/kdeplasma-addons/containments/groupingdesktop/panel/CMakeLists.txt
@@ -2,7 +2,7 @@
 set(groupingpanel_SRCS groupingpanel.cpp)
 
 kde4_add_plugin(plasma_containment_groupingpanel ${groupingpanel_SRCS})
-target_link_libraries(plasma_containment_groupingpanel ${KDE4_PLASMA_LIBS} plasma_groupingcontainment)
+target_link_libraries(plasma_containment_groupingpanel KDE4::plasma plasma_groupingcontainment)
 
 install(TARGETS plasma_containment_groupingpanel DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-containment-groupingpanel.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
\ No newline at end of file
diff --git a/kdeplasma-addons/dataengines/konsoleprofiles/CMakeLists.txt b/kdeplasma-addons/dataengines/konsoleprofiles/CMakeLists.txt
index 8533013d..20315373 100644
--- a/kdeplasma-addons/dataengines/konsoleprofiles/CMakeLists.txt
+++ b/kdeplasma-addons/dataengines/konsoleprofiles/CMakeLists.txt
@@ -4,7 +4,7 @@ set(konsoleprofilesengine_SRCS
 )
 
 kde4_add_plugin(plasma_engine_konsoleprofiles ${konsoleprofilesengine_SRCS})
-target_link_libraries(plasma_engine_konsoleprofiles ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(plasma_engine_konsoleprofiles KDE4::plasma KDE4::kio)
 
 install(TARGETS plasma_engine_konsoleprofiles DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-dataengine-konsoleprofiles.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} )
diff --git a/kdeplasma-addons/dataengines/potd/CMakeLists.txt b/kdeplasma-addons/dataengines/potd/CMakeLists.txt
index e99c5de5..d8c2602c 100644
--- a/kdeplasma-addons/dataengines/potd/CMakeLists.txt
+++ b/kdeplasma-addons/dataengines/potd/CMakeLists.txt
@@ -4,7 +4,7 @@ set(potd_engine_SRCS
 )
 
 kde4_add_plugin(plasma_engine_potd ${potd_engine_SRCS} )
-target_link_libraries(plasma_engine_potd plasmapotdprovidercore ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} )
+target_link_libraries(plasma_engine_potd plasmapotdprovidercore KDE4::kdeui KDE4::plasma )
 
 install(TARGETS plasma_engine_potd DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} )
 install(FILES plasma-dataengine-potd.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} )
@@ -17,7 +17,7 @@ set(potd_provider_core_SRCS
 )
 
 add_library(plasmapotdprovidercore SHARED ${potd_provider_core_SRCS})
-target_link_libraries(plasmapotdprovidercore ${KDE4_KDEUI_LIBS})
+target_link_libraries(plasmapotdprovidercore KDE4::kdeui)
 
 generate_export_header(plasmapotdprovidercore BASE_NAME plasma_potd)
 
@@ -32,7 +32,7 @@ set( potd_flickr_provider_SRCS
 )
 
 kde4_add_plugin( plasma_potd_flickrprovider ${potd_flickr_provider_SRCS} )
-target_link_libraries( plasma_potd_flickrprovider plasmapotdprovidercore ${KDE4_KIO_LIBS}  ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY})
+target_link_libraries( plasma_potd_flickrprovider plasmapotdprovidercore KDE4::kio  KDE4::kdecore ${QT_QTGUI_LIBRARY})
 install( TARGETS plasma_potd_flickrprovider DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} )
 install( FILES flickrprovider.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} )
 
@@ -42,7 +42,7 @@ set( potd_apod_provider_SRCS
 )
 
 kde4_add_plugin( plasma_potd_apodprovider ${potd_apod_provider_SRCS} )
-target_link_libraries( plasma_potd_apodprovider plasmapotdprovidercore ${KDE4_KIO_LIBS} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS})
+target_link_libraries( plasma_potd_apodprovider plasmapotdprovidercore KDE4::kio ${QT_QTGUI_LIBRARY} KDE4::kdecore)
 install( TARGETS plasma_potd_apodprovider DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} )
 install( FILES apodprovider.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} )
 
@@ -51,6 +51,6 @@ set( potd_epod_provider_SRCS
 )
 
 kde4_add_plugin( plasma_potd_epodprovider ${potd_epod_provider_SRCS} )
-target_link_libraries( plasma_potd_epodprovider plasmapotdprovidercore ${KDE4_KIO_LIBS} ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY})
+target_link_libraries( plasma_potd_epodprovider plasmapotdprovidercore KDE4::kio KDE4::kdecore ${QT_QTGUI_LIBRARY})
 install( TARGETS plasma_potd_epodprovider DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} )
 install( FILES epodprovider.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR} )
diff --git a/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt b/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt
index 80061ebe..1a9fb162 100644
--- a/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt
+++ b/kdeplasma-addons/libs/plasmaweather/CMakeLists.txt
@@ -17,8 +17,8 @@ set(plasmaweather_HEADERS
 
 add_library(plasmaweather SHARED ${plasmaweather_LIB_SRCS})
 target_link_libraries(plasmaweather
-    ${KDE4_PLASMA_LIBS}
-    ${KDE4_KDEUI_LIBS}
+    KDE4::plasma
+    KDE4::kdeui
     ${KDE4WORKSPACE_WEATHERION_LIBRARY}
 )
 
diff --git a/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt b/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt
index 8cc96adf..03b3a4a8 100644
--- a/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt
+++ b/kdeplasma-addons/runners/audioplayercontrol/CMakeLists.txt
@@ -9,15 +9,15 @@ set(kcm_krunner_audioplayercontrol_SRCS
 
 kde4_add_plugin(kcm_krunner_audioplayercontrol ${kcm_krunner_audioplayercontrol_SRCS})
 target_link_libraries(kcm_krunner_audioplayercontrol
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KCMUTILS_LIBS}
+    KDE4::kdecore
+    KDE4::kdeui
+    KDE4::kcmutils
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
 )
 
 kde4_add_plugin(krunner_audioplayercontrol ${krunner_audioplayercontrol_SRCS})
-target_link_libraries(krunner_audioplayercontrol ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS})
+target_link_libraries(krunner_audioplayercontrol KDE4::kio KDE4::kdeui KDE4::plasma)
 
 
 install(TARGETS krunner_audioplayercontrol kcm_krunner_audioplayercontrol DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/runners/characters/CMakeLists.txt b/kdeplasma-addons/runners/characters/CMakeLists.txt
index 39e62757..379a6a18 100644
--- a/kdeplasma-addons/runners/characters/CMakeLists.txt
+++ b/kdeplasma-addons/runners/characters/CMakeLists.txt
@@ -8,16 +8,16 @@ set(kcm_krunner_charrunner_SRCS
 
 kde4_add_plugin(kcm_krunner_charrunner ${kcm_krunner_charrunner_SRCS})
 target_link_libraries(kcm_krunner_charrunner
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KCMUTILS_LIBS} 
+    KDE4::kdecore
+    KDE4::kdeui
+    KDE4::kcmutils 
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
 )
 
 # Now make sure all files get to the right place
 kde4_add_plugin(krunner_charrunner ${krunner_charrunner_SRCS})
-target_link_libraries(krunner_charrunner ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(krunner_charrunner KDE4::plasma KDE4::kio)
 
 # Install the library and .desktop file
 install(
diff --git a/kdeplasma-addons/runners/converter/CMakeLists.txt b/kdeplasma-addons/runners/converter/CMakeLists.txt
index 49ee4143..448f9f61 100644
--- a/kdeplasma-addons/runners/converter/CMakeLists.txt
+++ b/kdeplasma-addons/runners/converter/CMakeLists.txt
@@ -5,7 +5,7 @@ set(krunner_converter_SRCS
 )
 
 kde4_add_plugin(krunner_converter ${krunner_converter_SRCS})
-target_link_libraries(krunner_converter ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS})
+target_link_libraries(krunner_converter KDE4::kio KDE4::plasma)
 install(TARGETS krunner_converter DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-runner-converter.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
 
diff --git a/kdeplasma-addons/runners/datetime/CMakeLists.txt b/kdeplasma-addons/runners/datetime/CMakeLists.txt
index 66d8ae6f..63cb227e 100644
--- a/kdeplasma-addons/runners/datetime/CMakeLists.txt
+++ b/kdeplasma-addons/runners/datetime/CMakeLists.txt
@@ -5,7 +5,7 @@ set(plasma_runner_datetime_SRCS
 )
 
 kde4_add_plugin(plasma_runner_datetime ${plasma_runner_datetime_SRCS})
-target_link_libraries(plasma_runner_datetime ${KDE4_PLASMA_LIBS})
+target_link_libraries(plasma_runner_datetime KDE4::plasma)
 
 install(TARGETS plasma_runner_datetime DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-runner-datetime.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kdeplasma-addons/runners/dictionary/CMakeLists.txt b/kdeplasma-addons/runners/dictionary/CMakeLists.txt
index 85bbf131..08c0e757 100644
--- a/kdeplasma-addons/runners/dictionary/CMakeLists.txt
+++ b/kdeplasma-addons/runners/dictionary/CMakeLists.txt
@@ -4,8 +4,8 @@ set(kcm_dictionaryrunner_SRCS dictionaryrunner_config.cpp)
 kde4_add_plugin(krunner_dictionary ${dictionaryrunner_SRCS})
 kde4_add_plugin(kcm_krunner_dictionary ${kcm_dictionaryrunner_SRCS})
 
-target_link_libraries(krunner_dictionary ${KDE4_PLASMA_LIBS})
-target_link_libraries(kcm_krunner_dictionary ${KDE4_KCMUTILS_LIBS})
+target_link_libraries(krunner_dictionary KDE4::plasma)
+target_link_libraries(kcm_krunner_dictionary KDE4::kcmutils)
 
 install(TARGETS krunner_dictionary kcm_krunner_dictionary DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-runner-dictionary.desktop plasma-runner-dictionary_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kdeplasma-addons/runners/katesessions/CMakeLists.txt b/kdeplasma-addons/runners/katesessions/CMakeLists.txt
index 69df7983..8798e219 100644
--- a/kdeplasma-addons/runners/katesessions/CMakeLists.txt
+++ b/kdeplasma-addons/runners/katesessions/CMakeLists.txt
@@ -3,7 +3,7 @@ set(krunner_katesessions_SRCS
 )
 
 kde4_add_plugin(krunner_katesessions ${krunner_katesessions_SRCS})
-target_link_libraries(krunner_katesessions ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(krunner_katesessions KDE4::plasma KDE4::kio)
 
 install(TARGETS krunner_katesessions DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} )
 
diff --git a/kdeplasma-addons/runners/konsolesessions/CMakeLists.txt b/kdeplasma-addons/runners/konsolesessions/CMakeLists.txt
index 94e8a026..68dda953 100644
--- a/kdeplasma-addons/runners/konsolesessions/CMakeLists.txt
+++ b/kdeplasma-addons/runners/konsolesessions/CMakeLists.txt
@@ -3,7 +3,7 @@ set(krunner_konsolesessions_SRCS
 )
 
 kde4_add_plugin(krunner_konsolesessions ${krunner_konsolesessions_SRCS})
-target_link_libraries(krunner_konsolesessions ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(krunner_konsolesessions KDE4::plasma KDE4::kio)
 
 install(TARGETS krunner_konsolesessions DESTINATION ${KDE4_PLUGIN_INSTALL_DIR} )
 
diff --git a/kdeplasma-addons/runners/spellchecker/CMakeLists.txt b/kdeplasma-addons/runners/spellchecker/CMakeLists.txt
index ef44e596..ee089c74 100644
--- a/kdeplasma-addons/runners/spellchecker/CMakeLists.txt
+++ b/kdeplasma-addons/runners/spellchecker/CMakeLists.txt
@@ -9,15 +9,15 @@ set(kcm_krunner_spellcheck_SRCS
 
 kde4_add_plugin(kcm_krunner_spellcheck ${kcm_krunner_spellcheck_SRCS})
 target_link_libraries(kcm_krunner_spellcheck 
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KCMUTILS_LIBS}
+    KDE4::kdecore
+    KDE4::kdeui
+    KDE4::kcmutils
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
     )
 
 kde4_add_plugin(krunner_spellcheckrunner ${krunner_spellcheckrunner_SRCS})
-target_link_libraries(krunner_spellcheckrunner ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS})
+target_link_libraries(krunner_spellcheckrunner KDE4::kcmutils KDE4::kdeui KDE4::plasma)
 
 install(TARGETS krunner_spellcheckrunner kcm_krunner_spellcheck DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-runner-spellchecker.desktop plasma-runner-spellchecker_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt b/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt
index 5e574a08..25229b10 100644
--- a/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt
+++ b/kdeplasma-addons/wallpapers/pattern/CMakeLists.txt
@@ -9,7 +9,7 @@ set(pattern_SRCS
 )
 
 kde4_add_plugin(plasma_wallpaper_pattern ${pattern_SRCS})
-target_link_libraries(plasma_wallpaper_pattern ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KFILE_LIBS})
+target_link_libraries(plasma_wallpaper_pattern KDE4::plasma KDE4::kdecore KDE4::kfile)
 
 install(TARGETS plasma_wallpaper_pattern DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-wallpaper-pattern.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kdeplasma-addons/wallpapers/potd/CMakeLists.txt b/kdeplasma-addons/wallpapers/potd/CMakeLists.txt
index 022b3d91..d6adc59b 100644
--- a/kdeplasma-addons/wallpapers/potd/CMakeLists.txt
+++ b/kdeplasma-addons/wallpapers/potd/CMakeLists.txt
@@ -6,7 +6,7 @@ set(potd_SRCS
 )
 
 kde4_add_plugin(plasma_wallpaper_potd ${potd_SRCS})
-target_link_libraries(plasma_wallpaper_potd ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(plasma_wallpaper_potd KDE4::plasma KDE4::kdeui KDE4::kio)
 
 install(TARGETS plasma_wallpaper_potd DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-wallpaper-potd.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt b/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt
index 64080cc7..52edb487 100644
--- a/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt
+++ b/kdeplasma-addons/wallpapers/qmlwallpapers/CMakeLists.txt
@@ -3,7 +3,7 @@ project(plasma-wallpaper-qml)
 kde4_add_plugin(plasma_wallpaper_qml wallpapersmodel.cpp wallpapersqml.cpp backgrounddelegate.cpp viewconfig.ui)
 target_link_libraries(plasma_wallpaper_qml
     ${QT_QTDECLARATIVE_LIBRARY}
-    ${KDE4_PLASMA_LIBS} ${KDE4_KDECORE_LIBS} kdeclarative
+    KDE4::plasma KDE4::kdecore kdeclarative
 )
 
 install(TARGETS plasma_wallpaper_qml DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/kdeplasma-addons/wallpapers/virus/CMakeLists.txt b/kdeplasma-addons/wallpapers/virus/CMakeLists.txt
index 7293e863..ac76074d 100644
--- a/kdeplasma-addons/wallpapers/virus/CMakeLists.txt
+++ b/kdeplasma-addons/wallpapers/virus/CMakeLists.txt
@@ -16,9 +16,9 @@ endif()
 
 kde4_add_plugin(plasma_wallpaper_virus ${virus_SRCS})
 target_link_libraries(plasma_wallpaper_virus
-    ${KDE4_PLASMA_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDE4_KFILE_LIBS}
+    KDE4::plasma
+    KDE4::kio
+    KDE4::kfile
 )
 
 install(
diff --git a/kdeplasma-addons/wallpapers/weather/CMakeLists.txt b/kdeplasma-addons/wallpapers/weather/CMakeLists.txt
index 0c24c9c4..19c01f86 100644
--- a/kdeplasma-addons/wallpapers/weather/CMakeLists.txt
+++ b/kdeplasma-addons/wallpapers/weather/CMakeLists.txt
@@ -12,7 +12,7 @@ set(weather_SRCS
 )
 
 kde4_add_plugin(plasma_wallpaper_weather ${weather_SRCS})
-target_link_libraries(plasma_wallpaper_weather ${KDE4_PLASMA_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} plasmaweather)
+target_link_libraries(plasma_wallpaper_weather KDE4::plasma KDE4::kio KDE4::kfile plasmaweather)
 
 install(TARGETS plasma_wallpaper_weather DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-wallpaper-weather.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kemu/CMakeLists.txt b/kemu/CMakeLists.txt
index 03689785..a0c1763d 100644
--- a/kemu/CMakeLists.txt
+++ b/kemu/CMakeLists.txt
@@ -24,8 +24,8 @@ set(kemu_sources
 
 add_executable(kemu ${kemu_sources})
 target_link_libraries(kemu
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KFILE_LIBS}
+    KDE4::kdeui
+    KDE4::kfile
     ${QT_QTDBUS_LIBRARY}
 )
 
diff --git a/kemu/kded/CMakeLists.txt b/kemu/kded/CMakeLists.txt
index abf97f2c..786e0361 100644
--- a/kemu/kded/CMakeLists.txt
+++ b/kemu/kded/CMakeLists.txt
@@ -6,7 +6,7 @@ set(kded_kemu_SRCS
 qt4_generate_dbus_interface(kded_kemu.h org.kde.kemu.xml)
 
 kde4_add_plugin(kded_kemu ${kded_kemu_SRCS})
-target_link_libraries(kded_kemu ${KDE4_KDECORE_LIBS})
+target_link_libraries(kded_kemu KDE4::kdecore)
 
 install(
     TARGETS kded_kemu
diff --git a/kemu/krunner/CMakeLists.txt b/kemu/krunner/CMakeLists.txt
index 4bc5e29e..bbaa9ac6 100644
--- a/kemu/krunner/CMakeLists.txt
+++ b/kemu/krunner/CMakeLists.txt
@@ -4,8 +4,8 @@ set(krunner_kemu_SRCS
 
 kde4_add_plugin(krunner_kemu ${krunner_kemu_SRCS})
 target_link_libraries(krunner_kemu
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_PLASMA_LIBS}
+    KDE4::kdeui
+    KDE4::plasma
 )
 
 install(
diff --git a/kget/CMakeLists.txt b/kget/CMakeLists.txt
index 5624c770..e04861f5 100644
--- a/kget/CMakeLists.txt
+++ b/kget/CMakeLists.txt
@@ -128,8 +128,8 @@ qt4_add_dbus_adaptor(kgetcore_SRCS dbus/org.kde.kget.verifier.xml dbus/dbusverif
 add_library(kgetcore SHARED ${kgetcore_SRCS})
 
 target_link_libraries(kgetcore
-    ${KDE4_KIO_LIBS}
-    ${KDE4_SOLID_LIBS}
+    KDE4::kio
+    KDE4::solid
 )
 
 if (KDE4WORKSPACE_FOUND)
@@ -215,11 +215,11 @@ qt4_add_dbus_adaptor(kget_SRCS dbus/org.kde.kget.main.xml dbus/dbuskgetwrapper.h
 add_executable(kget ${kget_SRCS})
 
 target_link_libraries(kget
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDE4_KCMUTILS_LIBS}
-    ${KDE4_KNOTIFYCONFIG_LIBS}
-    ${KDE4_KPASSWDSTORE_LIBS}
+    KDE4::kdeui
+    KDE4::kio
+    KDE4::kcmutils
+    KDE4::knotifyconfig
+    KDE4::kpasswdstore
     kgetcore
 )
 
diff --git a/kget/plasma/applet/CMakeLists.txt b/kget/plasma/applet/CMakeLists.txt
index 6cb3dd97..9d81f291 100644
--- a/kget/plasma/applet/CMakeLists.txt
+++ b/kget/plasma/applet/CMakeLists.txt
@@ -13,7 +13,7 @@ set(kgetbarapplet_SRCS
 qt4_add_dbus_interface(kgetbarapplet_SRCS ../../dbus/org.kde.kget.main.xml kget_interface)
 
 kde4_add_plugin(plasma_kget_barapplet ${kgetbarapplet_SRCS})
-target_link_libraries(plasma_kget_barapplet ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+target_link_libraries(plasma_kget_barapplet KDE4::plasma KDE4::kdeui)
 
 install(TARGETS plasma_kget_barapplet DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
@@ -26,7 +26,7 @@ install(TARGETS plasma_kget_barapplet DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 #qt4_add_dbus_interface(kgetpanelbar_SRCS ../../../kget/dbus/org.kde.kget.main.xml kget_interface)
 #
 #kde4_add_plugin(plasma_kget_panelbar ${kgetpanelbar_SRCS})
-#target_link_libraries(plasma_kget_panelbar ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
+#target_link_libraries(plasma_kget_panelbar KDE4::plasma KDE4::kdeui KDE4::kio)
 #
 #install(TARGETS plasma_kget_panelbar DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
@@ -38,7 +38,7 @@ set(kgetpiechart_SRCS
 qt4_add_dbus_interface(kgetpiechart_SRCS ../../dbus/org.kde.kget.main.xml kget_interface)
 
 kde4_add_plugin(plasma_kget_piechart ${kgetpiechart_SRCS})
-target_link_libraries(plasma_kget_piechart ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+target_link_libraries(plasma_kget_piechart KDE4::plasma KDE4::kdeui)
 
 install(TARGETS plasma_kget_piechart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
diff --git a/kget/plasma/engine/CMakeLists.txt b/kget/plasma/engine/CMakeLists.txt
index 52a7d7d8..1bd2e76b 100644
--- a/kget/plasma/engine/CMakeLists.txt
+++ b/kget/plasma/engine/CMakeLists.txt
@@ -7,7 +7,7 @@ set(kget_engine_SRCS
 qt4_add_dbus_interface(kget_engine_SRCS ../../dbus/org.kde.kget.main.xml kget_interface)
 
 kde4_add_plugin(plasma_engine_kget ${kget_engine_SRCS})
-target_link_libraries(plasma_engine_kget ${KDE4_KDECORE_LIBS} ${KDE4_PLASMA_LIBS})
+target_link_libraries(plasma_engine_kget KDE4::kdecore KDE4::plasma)
 
 install(TARGETS plasma_engine_kget DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-engine-kget.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kget/plasma/runner/CMakeLists.txt b/kget/plasma/runner/CMakeLists.txt
index fc84f0d9..e9dd7dde 100644
--- a/kget/plasma/runner/CMakeLists.txt
+++ b/kget/plasma/runner/CMakeLists.txt
@@ -8,7 +8,7 @@ kde4_add_plugin(krunner_kget
     ${krunner_kget_SRCS}
 )
 target_link_libraries(krunner_kget
-    ${KDE4_PLASMA_LIBS}
+    KDE4::plasma
 )
 
 install(TARGETS
diff --git a/kget/tests/CMakeLists.txt b/kget/tests/CMakeLists.txt
index 2bb6133e..8e10dda7 100644
--- a/kget/tests/CMakeLists.txt
+++ b/kget/tests/CMakeLists.txt
@@ -13,19 +13,19 @@ qt4_add_dbus_interface(kget_test_transfers_SRCS ../dbus/org.kde.kget.verifier.xm
 
 kde4_add_test(kget-test_transfers ${kget_test_transfers_SRCS})
 
-target_link_libraries(kget-test_transfers ${QT_QTTEST_LIBRARY} ${KDE4_KIO_LIBS} kgetcore)
+target_link_libraries(kget-test_transfers ${QT_QTTEST_LIBRARY} KDE4::kio kgetcore)
 
 
 #===========Verifier===========
 kde4_add_test(kget-verifiertest verifiertest.cpp)
 
-target_link_libraries(kget-verifiertest ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS} kgetcore)
+target_link_libraries(kget-verifiertest ${QT_QTTEST_LIBRARY} KDE4::kdecore kgetcore)
 
 
 #===========Scheduler===========
 kde4_add_test(kget-schedulertest schedulertest.cpp)
 
-target_link_libraries(kget-schedulertest ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDECORE_LIBS} kgetcore)
+target_link_libraries(kget-schedulertest ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} KDE4::kdecore kgetcore)
 
 #===========FileDeleter===========
 set(filedeletertest_SRCS
@@ -35,4 +35,4 @@ set(filedeletertest_SRCS
 
 kde4_add_test(kget-filedeletertest ${filedeletertest_SRCS})
 
-target_link_libraries(kget-filedeletertest ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
+target_link_libraries(kget-filedeletertest KDE4::kio ${QT_QTTEST_LIBRARY})
diff --git a/kget/transfer-plugins/checksumsearch/CMakeLists.txt b/kget/transfer-plugins/checksumsearch/CMakeLists.txt
index acbfe3eb..05d4e453 100644
--- a/kget/transfer-plugins/checksumsearch/CMakeLists.txt
+++ b/kget/transfer-plugins/checksumsearch/CMakeLists.txt
@@ -12,7 +12,7 @@ kde4_add_kcfg_files(kget_checksumsearchfactory_PART_SRCS checksumsearchsettings.
 
 kde4_add_plugin(kget_checksumsearchfactory ${kget_checksumsearchfactory_PART_SRCS})
 
-target_link_libraries(kget_checksumsearchfactory ${KDE4_KIO_LIBS} kgetcore)
+target_link_libraries(kget_checksumsearchfactory KDE4::kio kgetcore)
 
 install(TARGETS kget_checksumsearchfactory DESTINATION  ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES kget_checksumsearchfactory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
@@ -28,7 +28,7 @@ set(kcm_kget_checksumsearchfactory_PART_SRCS
 
 kde4_add_kcfg_files(kcm_kget_checksumsearchfactory_PART_SRCS checksumsearchsettings.kcfgc)
 kde4_add_plugin(kcm_kget_checksumsearchfactory ${kcm_kget_checksumsearchfactory_PART_SRCS})
-target_link_libraries(kcm_kget_checksumsearchfactory ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} kgetcore)
+target_link_libraries(kcm_kget_checksumsearchfactory KDE4::kdeui KDE4::kio kgetcore)
 install(TARGETS kcm_kget_checksumsearchfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 install(FILES kget_checksumsearchfactory_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kget/transfer-plugins/kio/CMakeLists.txt b/kget/transfer-plugins/kio/CMakeLists.txt
index f9af5572..93b4075c 100644
--- a/kget/transfer-plugins/kio/CMakeLists.txt
+++ b/kget/transfer-plugins/kio/CMakeLists.txt
@@ -10,7 +10,7 @@ set(kget_kiofactory_PART_SRCS
 
 kde4_add_plugin(kget_kiofactory ${kget_kiofactory_PART_SRCS})
 
-target_link_libraries(kget_kiofactory ${KDE4_KIO_LIBS} kgetcore)
+target_link_libraries(kget_kiofactory KDE4::kio kgetcore)
 
 install(TARGETS kget_kiofactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES kget_kiofactory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kget/transfer-plugins/mmsthreads/CMakeLists.txt b/kget/transfer-plugins/mmsthreads/CMakeLists.txt
index b451d19b..7653354f 100755
--- a/kget/transfer-plugins/mmsthreads/CMakeLists.txt
+++ b/kget/transfer-plugins/mmsthreads/CMakeLists.txt
@@ -13,7 +13,7 @@ set(kget_mmsfactory_PART_SRCS
 kde4_add_kcfg_files(kget_mmsfactory_PART_SRCS mmssettings.kcfgc)
 kde4_add_plugin(kget_mmsfactory ${kget_mmsfactory_PART_SRCS})
 
-target_link_libraries(kget_mmsfactory ${KDE4_KIO_LIBS} kgetcore ${LIBMMS_LIBRARIES})
+target_link_libraries(kget_mmsfactory KDE4::kio kgetcore ${LIBMMS_LIBRARIES})
 
 install(TARGETS kget_mmsfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES kget_mmsfactory.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
@@ -26,7 +26,7 @@ set(kcm_kget_mmsfactory_PART_SRCS
 )
 kde4_add_kcfg_files(kcm_kget_mmsfactory_PART_SRCS mmssettings.kcfgc)
 kde4_add_plugin(kcm_kget_mmsfactory ${kcm_kget_mmsfactory_PART_SRCS})
-target_link_libraries(kcm_kget_mmsfactory ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(kcm_kget_mmsfactory KDE4::kdeui KDE4::kio)
 install(TARGETS kcm_kget_mmsfactory DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
 install(FILES kget_mmsfactory_config.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kget/transfer-plugins/torrent/CMakeLists.txt b/kget/transfer-plugins/torrent/CMakeLists.txt
index b0b15f02..6326e462 100644
--- a/kget/transfer-plugins/torrent/CMakeLists.txt
+++ b/kget/transfer-plugins/torrent/CMakeLists.txt
@@ -15,7 +15,7 @@ set(kget_torrentfactory_PART_SRCS
 kde4_add_plugin(kget_torrentfactory ${kget_torrentfactory_PART_SRCS})
 
 target_link_libraries(kget_torrentfactory
-    ${KDE4_KDECORE_LIBS}
+    KDE4::kdecore
     ${LIBTORRENT_LIBRARIES}
     kgetcore
 )
@@ -41,7 +41,7 @@ set(kcm_kget_torrentfactory_PART_SRCS
 
 kde4_add_plugin(kcm_kget_torrentfactory ${kcm_kget_torrentfactory_PART_SRCS})
 target_link_libraries(kcm_kget_torrentfactory
-    ${KDE4_KDEUI_LIBS} 
+    KDE4::kdeui 
     ${LIBTORRENT_LIBRARIES}
 )
 
diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
index 29b9a549..18bb29a4 100644
--- a/kmix/CMakeLists.txt
+++ b/kmix/CMakeLists.txt
@@ -107,9 +107,9 @@ set(kmix_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS}
 add_executable(kmix ${kmix_SRCS})
 
 target_link_libraries(kmix
-    ${KDE4_SOLID_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_PLASMA_LIBS}
+    KDE4::solid
+    KDE4::kdeui
+    KDE4::plasma
     ${QT_QTXML_LIBRARY}
     ${X11_X11_LIB}
 )
@@ -150,8 +150,8 @@ kde4_add_plugin(kded_kmixd ${kded_kmixd_SRCS})
 
 
 target_link_libraries(kded_kmixd
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_SOLID_LIBS}
+    KDE4::kdeui
+    KDE4::solid
     ${QT_QTXML_LIBRARY}
 )
 
@@ -193,8 +193,8 @@ set(kmixctrl_SRCS ${kmix_adaptor_SRCS} ${kmix_backend_SRCS}
 add_executable(kmixctrl ${kmixctrl_SRCS})
 
 target_link_libraries(kmixctrl
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_SOLID_LIBS}
+    KDE4::kdeui
+    KDE4::solid
     ${QT_QTXML_LIBRARY}
 )
 
diff --git a/kmix/plasma/engine/CMakeLists.txt b/kmix/plasma/engine/CMakeLists.txt
index 7d57df2c..6924dccf 100644
--- a/kmix/plasma/engine/CMakeLists.txt
+++ b/kmix/plasma/engine/CMakeLists.txt
@@ -13,8 +13,8 @@ qt4_add_dbus_interface(mixer_engine_SRCS ../../dbus/org.kde.kmix.control.xml
 	control_interface)
 
 kde4_add_plugin(plasma_engine_mixer ${mixer_engine_SRCS})
-target_link_libraries(plasma_engine_mixer ${KDE4_KDECORE_LIBS}
-	${KDE4_PLASMA_LIBS})
+target_link_libraries(plasma_engine_mixer KDE4::kdecore
+	KDE4::plasma)
 
 install(TARGETS plasma_engine_mixer DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES plasma-engine-mixer.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/kmix/tests/CMakeLists.txt b/kmix/tests/CMakeLists.txt
index 363cb61b..d706180f 100644
--- a/kmix/tests/CMakeLists.txt
+++ b/kmix/tests/CMakeLists.txt
@@ -24,7 +24,7 @@ add_executable(profiletest ${profiletest_SRCS}
     ${kmix_adaptor_SRCS}
 )
 
-target_link_libraries(profiletest ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY})
+target_link_libraries(profiletest KDE4::kdecore KDE4::solid ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY})
 
 if (ALSA_FOUND)
     target_link_libraries(profiletest ${ALSA_LIBRARIES})
@@ -35,4 +35,4 @@ set(dialogtest_SRCS dialogtest.cpp)
 
 add_executable(dialogtest ${dialogtest_SRCS})
     
-target_link_libraries(dialogtest ${KDE4_KDEUI_LIBS})
+target_link_libraries(dialogtest KDE4::kdeui)
diff --git a/krdc/CMakeLists.txt b/krdc/CMakeLists.txt
index 1de6c276..c62f7ba2 100644
--- a/krdc/CMakeLists.txt
+++ b/krdc/CMakeLists.txt
@@ -60,14 +60,14 @@ set(krdc_SRCS
 add_executable(krdc ${krdc_SRCS})
 
 target_link_libraries(krdc
-    ${KDE4_KFILE_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDE4_KNOTIFYCONFIG_LIBS}
-    ${KDE4_KCMUTILS_LIBS}
+    KDE4::kfile
+    KDE4::kio
+    KDE4::knotifyconfig
+    KDE4::kcmutils
     krdccore
 )
 
-target_link_libraries(krdc ${KDE4_KDNSSD_LIBS})
+target_link_libraries(krdc KDE4::kdnssd)
 
 install(TARGETS krdc DESTINATION ${KDE4_BIN_INSTALL_DIR})
 install(FILES krdcui.rc DESTINATION ${KDE4_DATA_INSTALL_DIR}/krdc)
diff --git a/krdc/core/CMakeLists.txt b/krdc/core/CMakeLists.txt
index 3d514371..551a56cb 100644
--- a/krdc/core/CMakeLists.txt
+++ b/krdc/core/CMakeLists.txt
@@ -11,9 +11,9 @@ kde4_add_kcfg_files(krdccore_SRCS settings.kcfgc)
 add_library(krdccore SHARED ${krdccore_SRCS})
 
 target_link_libraries(krdccore
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KPASSWDSTORE_LIBS}
+    KDE4::kdecore
+    KDE4::kdeui
+    KDE4::kpasswdstore
 )
 
 set_target_properties(krdccore PROPERTIES
diff --git a/krdc/konsole/CMakeLists.txt b/krdc/konsole/CMakeLists.txt
index a6ea0468..f551fbb8 100644
--- a/krdc/konsole/CMakeLists.txt
+++ b/krdc/konsole/CMakeLists.txt
@@ -9,9 +9,9 @@ if(BUILD_KONSOLE)
     kde4_add_plugin(krdc_konsoleplugin ${konsoleplugin_SRCS})
 
     target_link_libraries(krdc_konsoleplugin 
-        ${KDE4_KDECORE_LIBS}
-        ${KDE4_KDEUI_LIBS}
-        ${KDE4_KPARTS_LIBS}
+        KDE4::kdecore
+        KDE4::kdeui
+        KDE4::kparts
         krdccore
     )
     install(TARGETS krdc_konsoleplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/krdc/rdp/CMakeLists.txt b/krdc/rdp/CMakeLists.txt
index 88fee135..abef2d0a 100644
--- a/krdc/rdp/CMakeLists.txt
+++ b/krdc/rdp/CMakeLists.txt
@@ -20,8 +20,8 @@ if(HAVE_XFREERDP)
     kde4_add_plugin(krdc_rdpplugin ${rdpplugin_SRCS})
 
     target_link_libraries(krdc_rdpplugin 
-        ${KDE4_KDECORE_LIBS}
-        ${KDE4_KDEUI_LIBS}
+        KDE4::kdecore
+        KDE4::kdeui
         krdccore
     )
 
@@ -32,7 +32,7 @@ if(HAVE_XFREERDP)
     kde4_add_plugin(kcm_krdc_rdpplugin ${kcm_krdc_rdpplugin_SRCS})
 
     target_link_libraries(kcm_krdc_rdpplugin
-        ${KDE4_KDEUI_LIBS}
+        KDE4::kdeui
         krdccore
     )
 
diff --git a/krdc/test/CMakeLists.txt b/krdc/test/CMakeLists.txt
index 314bf21d..ae926f39 100644
--- a/krdc/test/CMakeLists.txt
+++ b/krdc/test/CMakeLists.txt
@@ -10,8 +10,8 @@ set(testplugin_SRCS
 kde4_add_plugin(krdc_testplugin ${testplugin_SRCS})
 
 target_link_libraries(krdc_testplugin
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KDEUI_LIBS}
+    KDE4::kdecore
+    KDE4::kdeui
     krdccore
 )
 install(TARGETS krdc_testplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
diff --git a/krdc/vnc/CMakeLists.txt b/krdc/vnc/CMakeLists.txt
index 8edf8524..2b28cad6 100644
--- a/krdc/vnc/CMakeLists.txt
+++ b/krdc/vnc/CMakeLists.txt
@@ -18,8 +18,8 @@ if(LIBVNCSERVER_FOUND)
     kde4_add_plugin(krdc_vncplugin ${vncplugin_SRCS})
 
     target_link_libraries(krdc_vncplugin 
-        ${KDE4_KDECORE_LIBS}
-        ${KDE4_KDEUI_LIBS}
+        KDE4::kdecore
+        KDE4::kdeui
         ${LIBVNCCLIENT_LIBRARIES}
         krdccore
     )
@@ -31,7 +31,7 @@ if(LIBVNCSERVER_FOUND)
     kde4_add_plugin(kcm_krdc_vncplugin ${kcm_krdc_vncplugin_SRCS})
 
     target_link_libraries(kcm_krdc_vncplugin
-        ${KDE4_KDEUI_LIBS}
+        KDE4::kdeui
         krdccore
     )
 
diff --git a/krfb/framebuffers/qt/CMakeLists.txt b/krfb/framebuffers/qt/CMakeLists.txt
index 0f31f2f7..c8eae9b8 100644
--- a/krfb/framebuffers/qt/CMakeLists.txt
+++ b/krfb/framebuffers/qt/CMakeLists.txt
@@ -14,7 +14,7 @@ kde4_add_plugin (krfb_framebuffer_qt
 target_link_libraries (krfb_framebuffer_qt
                        ${QT_QTCORE_LIBRARY}
                        ${QT_QTGUI_LIBRARY}
-                       ${KDE4_KDEUI_LIBS}
+                       KDE4::kdeui
                        krfbprivate
 )
 
diff --git a/krfb/framebuffers/x11/CMakeLists.txt b/krfb/framebuffers/x11/CMakeLists.txt
index b91e8c93..7b61df04 100644
--- a/krfb/framebuffers/x11/CMakeLists.txt
+++ b/krfb/framebuffers/x11/CMakeLists.txt
@@ -19,7 +19,7 @@ kde4_add_plugin(krfb_framebuffer_x11
 )
 
 target_link_libraries(krfb_framebuffer_x11
-    ${KDE4_KDEUI_LIBS}
+    KDE4::kdeui
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
     ${X11_X11_LIB}
diff --git a/krfb/krfb/CMakeLists.txt b/krfb/krfb/CMakeLists.txt
index 2e6ffa00..0d28b1dc 100644
--- a/krfb/krfb/CMakeLists.txt
+++ b/krfb/krfb/CMakeLists.txt
@@ -76,9 +76,9 @@ target_link_libraries(krfb
     ${X11_Xdamage_LIB}
     ${X11_XTest_LIB}
     ${QT_QTNETWORK_LIBRARY}
-    ${KDE4_KDNSSD_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KPASSWDSTORE_LIBS}
+    KDE4::kdnssd
+    KDE4::kdeui
+    KDE4::kpasswdstore
     ${LIBVNCSERVER_LIBRARIES}
 )
 
diff --git a/ksnapshot/CMakeLists.txt b/ksnapshot/CMakeLists.txt
index b817f3f0..ad7b749e 100644
--- a/ksnapshot/CMakeLists.txt
+++ b/ksnapshot/CMakeLists.txt
@@ -53,7 +53,7 @@ qt4_add_dbus_adaptor(ksnapshot_SRCS org.kde.ksnapshot.xml ksnapshot.h KSnapshot)
 
 add_executable(ksnapshot ${ksnapshot_SRCS})
 
-target_link_libraries(ksnapshot ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
+target_link_libraries(ksnapshot KDE4::kio ${X11_LIBRARIES})
 
 if (X11_Xfixes_FOUND)
     target_link_libraries(ksnapshot ${X11_Xfixes_LIB})
@@ -73,7 +73,7 @@ set(kbackgroundsnapshot_SRCS
 
 add_executable(kbackgroundsnapshot ${kbackgroundsnapshot_SRCS})
 target_link_libraries(kbackgroundsnapshot
-    ${KDE4_KIO_LIBS}
+    KDE4::kio
     ${X11_LIBRARIES}
 )
 
diff --git a/ktimer/CMakeLists.txt b/ktimer/CMakeLists.txt
index 636533a5..92507fb9 100644
--- a/ktimer/CMakeLists.txt
+++ b/ktimer/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 set(ktimer_SRCS main.cpp ktimer.cpp prefwidget.ui)
 
 add_executable(ktimer ${ktimer_SRCS})
-target_link_libraries(ktimer  ${KDE4_KIO_LIBS})
+target_link_libraries(ktimer  KDE4::kio)
 
 install(
     TARGETS ktimer
diff --git a/kvkbd/src/CMakeLists.txt b/kvkbd/src/CMakeLists.txt
index 7ac215f3..18f8058d 100644
--- a/kvkbd/src/CMakeLists.txt
+++ b/kvkbd/src/CMakeLists.txt
@@ -23,8 +23,8 @@ QT4_ADD_DBUS_ADAPTOR(kvkbd_SRCS org.kde.kvkbd.Dock.xml
 add_executable(kvkbd ${kvkbd_SRCS})
 
 target_link_libraries(kvkbd
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KDEUI_LIBS}
+    KDE4::kdecore
+    KDE4::kdeui
     ${QT_QTDBUS_LIBRARY}
     ${QT_QTXML_LIBRARY}
     ${X11_X11_LIB}
diff --git a/okular/CMakeLists.txt b/okular/CMakeLists.txt
index c9516944..8b48d666 100644
--- a/okular/CMakeLists.txt
+++ b/okular/CMakeLists.txt
@@ -145,8 +145,8 @@ kde4_add_kcfg_files(okularcore_SRCS ${PROJECT_SOURCE_DIR}/conf/settings_core.kcf
 
 add_library(okularcore SHARED ${okularcore_SRCS})
 target_link_libraries(okularcore
-    ${KDE4_KIO_LIBS}
-    ${KDE4_KARCHIVE_LIBS}
+    KDE4::kio
+    KDE4::karchive
     ${MATH_LIB}
     KDE4::kmediaplayer
 )
@@ -238,9 +238,9 @@ kde4_add_kcfg_files(okularpart_SRCS ${PROJECT_SOURCE_DIR}/conf/settings.kcfgc )
 kde4_add_plugin(okularpart ${okularpart_SRCS})
 
 target_link_libraries(okularpart
-    ${KDE4_KPARTS_LIBS}
-    ${KDE4_KPASSWDSTORE_LIBS}
-    ${KDE4_KARCHIVE_LIBS}
+    KDE4::kparts
+    KDE4::kpasswdstore
+    KDE4::karchive
     ${QT_QTGUI_LIBRARY}
     ${QT_QTDBUS_LIBRARY}
     ${MATH_LIB}
diff --git a/okular/generators/comicbook/CMakeLists.txt b/okular/generators/comicbook/CMakeLists.txt
index 49442b72..f0c51c4b 100644
--- a/okular/generators/comicbook/CMakeLists.txt
+++ b/okular/generators/comicbook/CMakeLists.txt
@@ -13,8 +13,8 @@ set(okularGenerator_comicbook_PART_SRCS
 kde4_add_plugin(okularGenerator_comicbook ${okularGenerator_comicbook_PART_SRCS})
 
 target_link_libraries(okularGenerator_comicbook
-    ${KDE4_KIO_LIBS}
-    ${KDE4_KARCHIVE_LIBS}
+    KDE4::kio
+    KDE4::karchive
     okularcore
 )
 
diff --git a/okular/generators/djvu/CMakeLists.txt b/okular/generators/djvu/CMakeLists.txt
index 98bdc0b5..5bcf7628 100644
--- a/okular/generators/djvu/CMakeLists.txt
+++ b/okular/generators/djvu/CMakeLists.txt
@@ -16,7 +16,7 @@ set(okularGenerator_djvu_SRCS
 
 kde4_add_plugin(okularGenerator_djvu ${okularGenerator_djvu_SRCS})
 
-target_link_libraries(okularGenerator_djvu okularcore ${DJVULIBRE_LIBRARY} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY})
+target_link_libraries(okularGenerator_djvu okularcore ${DJVULIBRE_LIBRARY} KDE4::kdeui ${QT_QTXML_LIBRARY})
 
 install(TARGETS okularGenerator_djvu DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
diff --git a/okular/generators/epub/CMakeLists.txt b/okular/generators/epub/CMakeLists.txt
index 93ed6e96..967076a8 100644
--- a/okular/generators/epub/CMakeLists.txt
+++ b/okular/generators/epub/CMakeLists.txt
@@ -15,7 +15,7 @@ set(okularGenerator_epub_PART_SRCS
 
 kde4_add_plugin(okularGenerator_epub ${okularGenerator_epub_PART_SRCS})
 
-target_link_libraries(okularGenerator_epub okularcore ${EPUB_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}  ${QT_QTXML_LIBRARY})
+target_link_libraries(okularGenerator_epub okularcore ${EPUB_LIBRARIES} KDE4::kdecore KDE4::kdeui ${QT_QTGUI_LIBRARY}  ${QT_QTXML_LIBRARY})
 
 install(TARGETS okularGenerator_epub DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
diff --git a/okular/generators/fictionbook/CMakeLists.txt b/okular/generators/fictionbook/CMakeLists.txt
index a43538fa..2b05716f 100644
--- a/okular/generators/fictionbook/CMakeLists.txt
+++ b/okular/generators/fictionbook/CMakeLists.txt
@@ -15,7 +15,7 @@ set(okularGenerator_fb_PART_SRCS
 
 kde4_add_plugin(okularGenerator_fb ${okularGenerator_fb_PART_SRCS})
 
-target_link_libraries(okularGenerator_fb okularcore ${KDE4_KIO_LIBS} ${KDE4_KARCHIVE_LIBS} ${QT_QTXML_LIBRARY})
+target_link_libraries(okularGenerator_fb okularcore KDE4::kio KDE4::karchive ${QT_QTXML_LIBRARY})
 
 install(TARGETS okularGenerator_fb DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
diff --git a/okular/generators/markdown/CMakeLists.txt b/okular/generators/markdown/CMakeLists.txt
index 60b3378f..692c007d 100644
--- a/okular/generators/markdown/CMakeLists.txt
+++ b/okular/generators/markdown/CMakeLists.txt
@@ -18,9 +18,9 @@ set(okularGenerator_markdown_SRCS
 kde4_add_plugin(okularGenerator_md ${okularGenerator_markdown_SRCS})
 
 target_link_libraries(okularGenerator_md okularcore
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KIO_LIBS}
+    KDE4::kdecore
+    KDE4::kdeui
+    KDE4::kio
     ${QT_QTGUI_LIBRARY}
 )
 
diff --git a/okular/generators/poppler/CMakeLists.txt b/okular/generators/poppler/CMakeLists.txt
index 1fb2df36..ff12c5fa 100644
--- a/okular/generators/poppler/CMakeLists.txt
+++ b/okular/generators/poppler/CMakeLists.txt
@@ -15,7 +15,7 @@ set(okularGenerator_poppler_PART_SRCS
 kde4_add_plugin(okularGenerator_poppler ${okularGenerator_poppler_PART_SRCS})
 
 target_link_libraries(okularGenerator_poppler
-    ${KDE4_KDEUI_LIBS}
+    KDE4::kdeui
     ${POPPLER_LIBRARIES}
     okularcore
 )
diff --git a/okular/generators/spectre/CMakeLists.txt b/okular/generators/spectre/CMakeLists.txt
index f748e103..9900940c 100644
--- a/okular/generators/spectre/CMakeLists.txt
+++ b/okular/generators/spectre/CMakeLists.txt
@@ -20,7 +20,7 @@ kde4_add_kcfg_files(okularGenerator_ghostview_SRCS conf/gssettings.kcfgc)
 kde4_add_plugin(okularGenerator_ghostview ${okularGenerator_ghostview_SRCS})
 
 target_link_libraries(okularGenerator_ghostview
-    ${KDE4_KDEUI_LIBS}
+    KDE4::kdeui
     ${QT_QTXML_LIBRARY}
     ${LIBSPECTRE_LIBRARY}
     okularcore
diff --git a/okular/generators/txt/CMakeLists.txt b/okular/generators/txt/CMakeLists.txt
index 8e914d1a..596a32f2 100644
--- a/okular/generators/txt/CMakeLists.txt
+++ b/okular/generators/txt/CMakeLists.txt
@@ -14,7 +14,7 @@ set(okularGenerator_txt_SRCS
 
 kde4_add_plugin(okularGenerator_txt ${okularGenerator_txt_SRCS})
 
-target_link_libraries(okularGenerator_txt okularcore ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
+target_link_libraries(okularGenerator_txt okularcore KDE4::kdecore KDE4::kdeui ${QT_QTGUI_LIBRARY})
 
 install(TARGETS okularGenerator_txt DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 
diff --git a/okular/shell/CMakeLists.txt b/okular/shell/CMakeLists.txt
index f2942b4b..062d52c4 100644
--- a/okular/shell/CMakeLists.txt
+++ b/okular/shell/CMakeLists.txt
@@ -12,7 +12,7 @@ set(okular_SRCS
 )
 
 add_executable(okular ${okular_SRCS})
-target_link_libraries(okular ${KDE4_KPARTS_LIBS})
+target_link_libraries(okular KDE4::kparts)
 
 install(
     TARGETS okular
diff --git a/okular/tests/CMakeLists.txt b/okular/tests/CMakeLists.txt
index 482416c9..5cdad3df 100644
--- a/okular/tests/CMakeLists.txt
+++ b/okular/tests/CMakeLists.txt
@@ -1,35 +1,35 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
 
 kde4_add_test(okular-shelltest shelltest.cpp ../shell/shellutils.cpp )
-target_link_libraries(okular-shelltest ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} )
+target_link_libraries(okular-shelltest KDE4::kdecore ${QT_QTTEST_LIBRARY} )
 
 kde4_add_test(okular-parttest parttest.cpp )
-target_link_libraries(okular-parttest ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularpart okularcore )
+target_link_libraries(okular-parttest KDE4::kdecore KDE4::kparts ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularpart okularcore )
 
 kde4_add_test(okular-documenttest documenttest.cpp )
-target_link_libraries(okular-documenttest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
+target_link_libraries(okular-documenttest KDE4::kdecore ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
 
 kde4_add_test(okular-searchtest searchtest.cpp )
-target_link_libraries(okular-searchtest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
+target_link_libraries(okular-searchtest KDE4::kdecore ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
 
 kde4_add_test(okular-annotationstest annotationstest.cpp )
-target_link_libraries(okular-annotationstest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
+target_link_libraries(okular-annotationstest KDE4::kdecore ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} okularcore )
 
 kde4_add_test(okular-editannotationcontentstest editannotationcontentstest.cpp testingutils.cpp)
-target_link_libraries(okular-editannotationcontentstest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
+target_link_libraries(okular-editannotationcontentstest KDE4::kdecore ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
 
 kde4_add_test(okular-addremoveannotationtest addremoveannotationtest.cpp testingutils.cpp)
-target_link_libraries(okular-addremoveannotationtest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
+target_link_libraries(okular-addremoveannotationtest KDE4::kdecore ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
 
 kde4_add_test(okular-translateannotationtest translateannotationtest.cpp testingutils.cpp)
-target_link_libraries(okular-translateannotationtest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
+target_link_libraries(okular-translateannotationtest KDE4::kdecore ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
 
 kde4_add_test(okular-modifyannotationpropertiestest modifyannotationpropertiestest.cpp testingutils.cpp)
-target_link_libraries(okular-modifyannotationpropertiestest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
+target_link_libraries(okular-modifyannotationpropertiestest KDE4::kdecore ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
 
 # forms are not implemented
 # kde4_add_test(okular-editformstest editformstest.cpp )
-# target_link_libraries(okular-editformstest ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
+# target_link_libraries(okular-editformstest KDE4::kdecore ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTXML_LIBRARY} okularcore )
 
 kde4_add_test(okular-mainshelltest mainshelltest.cpp ../shell/okular_main.cpp ../shell/shellutils.cpp ../shell/shell.cpp )
-target_link_libraries(okular-mainshelltest ${KDE4_KPARTS_LIBS} ${QT_QTTEST_LIBRARY} okularpart okularcore )
+target_link_libraries(okular-mainshelltest KDE4::kparts ${QT_QTTEST_LIBRARY} okularpart okularcore )
diff --git a/partitionmanager/src/CMakeLists.txt b/partitionmanager/src/CMakeLists.txt
index 9e4496ad..ca72b874 100644
--- a/partitionmanager/src/CMakeLists.txt
+++ b/partitionmanager/src/CMakeLists.txt
@@ -185,11 +185,11 @@ kde4_add_kcfg_files(partitionmanagerprivate_SRCS config.kcfgc)
 
 add_library(partitionmanagerprivate SHARED ${partitionmanagerprivate_SRCS})
 target_link_libraries(partitionmanagerprivate
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KFILE_LIBS}
-    ${KDE4_KIO_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_SOLID_LIBS}
+    KDE4::kdecore
+    KDE4::kfile
+    KDE4::kio
+    KDE4::kdeui
+    KDE4::solid
     ${UUID_LIBRARIES}
     ${BLKID_LIBRARIES}
 )
@@ -209,8 +209,8 @@ install(
 
 add_executable(partitionmanager main.cpp)
 target_link_libraries(partitionmanager
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KDEUI_LIBS}
+    KDE4::kdecore
+    KDE4::kdeui
     partitionmanagerprivate
 )
 
diff --git a/partitionmanager/src/plugins/dummy/CMakeLists.txt b/partitionmanager/src/plugins/dummy/CMakeLists.txt
index e097cc77..28d2ab57 100644
--- a/partitionmanager/src/plugins/dummy/CMakeLists.txt
+++ b/partitionmanager/src/plugins/dummy/CMakeLists.txt
@@ -19,7 +19,7 @@ file (GLOB pmdummybackendplugin_SRCS *.cpp)
 
 kde4_add_plugin(pmdummybackendplugin ${pmdummybackendplugin_SRCS})
 
-target_link_libraries(pmdummybackendplugin partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${LIBPARTED_LIBS} ${BLKID_LIBRARIES} ${KDE4_SOLID_LIBS})
+target_link_libraries(pmdummybackendplugin partitionmanagerprivate KDE4::kdecore KDE4::kio ${LIBPARTED_LIBS} ${BLKID_LIBRARIES} KDE4::solid)
 
 install(TARGETS pmdummybackendplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES pmdummybackendplugin.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/partitionmanager/src/plugins/libparted/CMakeLists.txt b/partitionmanager/src/plugins/libparted/CMakeLists.txt
index afb47902..61d336de 100644
--- a/partitionmanager/src/plugins/libparted/CMakeLists.txt
+++ b/partitionmanager/src/plugins/libparted/CMakeLists.txt
@@ -29,7 +29,7 @@ file (GLOB pmlibpartedbackendplugin_SRCS *.cpp)
 
 kde4_add_plugin(pmlibpartedbackendplugin ${pmlibpartedbackendplugin_SRCS})
 
-target_link_libraries(pmlibpartedbackendplugin partitionmanagerprivate ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${LIBPARTED_LIBS} ${BLKID_LIBRARIES} ${KDE4_SOLID_LIBS})
+target_link_libraries(pmlibpartedbackendplugin partitionmanagerprivate KDE4::kdecore KDE4::kio ${LIBPARTED_LIBS} ${BLKID_LIBRARIES} KDE4::solid)
 
 install(TARGETS pmlibpartedbackendplugin DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
 install(FILES pmlibpartedbackendplugin.desktop DESTINATION ${KDE4_SERVICES_INSTALL_DIR})
diff --git a/thumbnailers/audio/CMakeLists.txt b/thumbnailers/audio/CMakeLists.txt
index ebeba0ae..b68e980e 100644
--- a/thumbnailers/audio/CMakeLists.txt
+++ b/thumbnailers/audio/CMakeLists.txt
@@ -18,7 +18,7 @@ set(AudioThumbs_SRCS AudioThumbs.cpp)
 kde4_add_plugin(AudioThumbs ${AudioThumbs_SRCS})
 
 target_link_libraries(AudioThumbs
-    ${KDE4_KIO_LIBS}
+    KDE4::kio
     ${TAGLIB_LIBRARIES}
 )
 
diff --git a/thumbnailers/ffmpegthumbs/CMakeLists.txt b/thumbnailers/ffmpegthumbs/CMakeLists.txt
index a1ca0bb9..c5e043ca 100644
--- a/thumbnailers/ffmpegthumbs/CMakeLists.txt
+++ b/thumbnailers/ffmpegthumbs/CMakeLists.txt
@@ -39,7 +39,7 @@ kde4_add_kcfg_files(ffmpegthumbs_PART_SRCS ffmpegthumbssettings.kcfgc)
 kde4_add_plugin(ffmpegthumbs ${ffmpegthumbs_PART_SRCS})
 
 target_link_libraries(ffmpegthumbs
-    ${KDE4_KIO_LIBS}
+    KDE4::kio
     ${FFMPEGTHUMBNAILER_LIBRARIES}
 )
 
diff --git a/thumbnailers/pdf/CMakeLists.txt b/thumbnailers/pdf/CMakeLists.txt
index 19b866a2..1c5d8862 100644
--- a/thumbnailers/pdf/CMakeLists.txt
+++ b/thumbnailers/pdf/CMakeLists.txt
@@ -10,8 +10,8 @@ kde4_add_kcfg_files(pdfthumbnail_PART_SRCS pdfcreatorsettings.kcfgc)
 kde4_add_plugin(pdfthumbnail ${pdfthumbnail_PART_SRCS})
 
 target_link_libraries(pdfthumbnail
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KIO_LIBS}
+    KDE4::kdecore
+    KDE4::kio
     ${QT_QTGUI_LIBRARY}
     ${POPPLER_LIBRARIES}
 )
diff --git a/thumbnailers/po/CMakeLists.txt b/thumbnailers/po/CMakeLists.txt
index 7f8e0953..fc5b81a7 100644
--- a/thumbnailers/po/CMakeLists.txt
+++ b/thumbnailers/po/CMakeLists.txt
@@ -10,7 +10,7 @@ kde4_add_kcfg_files(pothumbnail_SRCS pocreatorsettings.kcfgc)
 
 kde4_add_plugin(pothumbnail ${pothumbnail_SRCS})
 target_link_libraries(pothumbnail
-    ${KDE4_KIO_LIBS}
+    KDE4::kio
     ${GETTEXTPO_LIBRARY}
 )
 
diff --git a/thumbnailers/ps/CMakeLists.txt b/thumbnailers/ps/CMakeLists.txt
index eb1273aa..dfb44325 100644
--- a/thumbnailers/ps/CMakeLists.txt
+++ b/thumbnailers/ps/CMakeLists.txt
@@ -10,8 +10,8 @@ kde4_add_kcfg_files(psthumbnail_PART_SRCS pscreatorsettings.kcfgc)
 kde4_add_plugin(psthumbnail ${psthumbnail_PART_SRCS})
 
 target_link_libraries(psthumbnail
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KIO_LIBS}
+    KDE4::kdecore
+    KDE4::kio
     ${QT_QTGUI_LIBRARY}
     ${LIBSPECTRE_LIBRARY}
 )