cmake fixes

- finally remove KDE4_KIO_LIBS
- change KDeclarative to KF5::KDeclarative
- add KService where needed

examples/dataengines/customDataContainers/CMakeLists.txt

@@ -8,8 +8,8 @@ kservice_desktop_to_json(plasma-dataengine-example-customDataContainers.desktop)
 plasma_add_plugin(plasma_dataengine_example_customDataContainers ${customDataContainers_SRCS})
 target_link_libraries(plasma_dataengine_example_customDataContainers
   plasma
-  ${KService_LIBRARIES}
-  ${KDE4_KIO_LIBS}
+  KF5::KIOCore
+  KF5::KService
 )
 
 install(TARGETS plasma_dataengine_example_customDataContainers DESTINATION ${PLUGIN_INSTALL_DIR})

src/declarativeimports/dirmodel/CMakeLists.txt

@@ -10,7 +10,8 @@ add_library(dirmodelplugin SHARED ${dirmodel_SRCS})
 target_link_libraries(dirmodelplugin
         ${QT_QTCORE_LIBRARY}
         ${Qt5Qml_LIBRARIES}
-        ${KDE4_KIO_LIBS}
+	KF5::KIOCore
+	KF5::KIOWidgets
         ${KDE4Support_LIBRARIES}
         KF5::KGuiAddons
         )

src/plasma/CMakeLists.txt

@@ -37,7 +37,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
 
 if(NOT PLASMA_NO_KIO)
    include_directories(${KDE4_KIO_INCLUDES})
-   set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KIO_LIBS})
+   set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS})
 endif(NOT PLASMA_NO_KIO)
 
 if(NOT PLASMA_NO_SOLID)
@@ -149,13 +149,16 @@ target_link_libraries(plasma
     KF5::KGuiAddons
     KF5::KIconThemes
     KF5::KI18n
+    KF5::KService
+    KF5::KIOCore
+    KF5::KIOWidgets
     KF5::KDE4Attic
     Qt5::UiTools
     ${KDE4Attic_LIBRARIES}
     ${KDE4Support_LIBRARIES} # needed for KStandardDirs and KGlobal
 )
 #FIXME gpgme++ is in kdepimlibs, needs to be elsewhere
-target_link_libraries(plasma KDeclarative ${KArchive_LIBRARIES})
+target_link_libraries(plasma KF5::KDeclarative ${KArchive_LIBRARIES})
 
 if(X11_FOUND)
    target_link_libraries(plasma Qt5::X11Extras ${X11_LIBRARIES})

src/plasma/autotests/CMakeLists.txt

@@ -14,9 +14,10 @@ MACRO(PLASMA_UNIT_TESTS)
        FOREACH(_testname ${ARGN})
                add_executable(${_testname} ${_testname}.cpp)
                target_link_libraries(${_testname} ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
-                                     ${KDE4_KIO_LIBS} plasma ${KArchive_LIBRARIES} ${KCoreAddons_LIBRARIES}
+                                     plasma ${KArchive_LIBRARIES} ${KCoreAddons_LIBRARIES}
                                      KF5::KConfigGui
                                      KF5::KI18n
+				     KF5::KIOCore
 				     KF5::KService)
                if(QT_QTOPENGL_FOUND)
                    target_link_libraries(${_testname} ${QT_QTOPENGL_LIBRARY})
@@ -35,7 +36,7 @@ PLASMA_UNIT_TESTS(
 )
 
 add_executable(storagetest storagetest.cpp ../private/storage.cpp ../private/storagethread.cpp)
-target_link_libraries(storagetest ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTSQL_LIBRARY} ${KDE4_KIO_LIBS} plasma ${KCoreAddons_LIBRARIES} )
+target_link_libraries(storagetest ${QT_QTTEST_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTSQL_LIBRARY} KF5::KIOCore plasma ${KCoreAddons_LIBRARIES} )
 add_test(plasma-storagetest storagetest)
 ecm_mark_as_test(plasma-storagetest)
 

src/plasmaquick/CMakeLists.txt

@@ -25,7 +25,7 @@ target_link_libraries(PlasmaQuick
     ${KCoreAddons_LIBRARIES}
     ${XmlGui_LIBRARIES}
     plasma
-    KDeclarative
+    KF5::KDeclarative
 )
 
 set_target_properties(PlasmaQuick PROPERTIES

src/platformstatus/CMakeLists.txt

@@ -20,8 +20,10 @@ target_link_libraries(
    ${KCoreAddons_LIBRARIES}
    ${KDBusAddons_LIBRARIES}
    ${KI18n_LIBRARIES}
+   KF5::KIOCore KF5::KIOWidgets
    Qt5::DBus
    Qt5::Quick
+   #${KDE4_KIO_LIBS}
    )
 
 install( TARGETS kded_platformstatus        DESTINATION ${PLUGIN_INSTALL_DIR} )

src/scriptengines/qml/CMakeLists.txt

@@ -28,7 +28,8 @@ add_library(plasma_appletscript_declarative MODULE ${declarative_appletscript_SR
 set_target_properties(plasma_appletscript_declarative PROPERTIES PREFIX "")
 
 target_link_libraries(plasma_appletscript_declarative
-    ${KDE4_KIO_LIBS}
+    KF5::KIOCore
+    KF5::KIOWidgets	
     ${KDE4Support_LIBRARIES}
     ${KDE4Attic_LIBRARIES}
     ${QT_QTSCRIPT_LIBRARY}
@@ -38,7 +39,7 @@ target_link_libraries(plasma_appletscript_declarative
     ${KCore_LIBRARIES}
     KF5::KI18n
     plasma
-    KDeclarative
+    KF5::KDeclarative
 )
 
 

src/shell/CMakeLists.txt

@@ -77,7 +77,7 @@ target_link_libraries(plasma-shell
  ${Qt5Quick_LIBRARIES}
  ${Qt5Qml_LIBRARIES}
  ${KCore_LIBRARIES}
- ${KDE4_KIO_LIBS}
+ KF5::KIOCore
  ${KWindowSystem_LIBRARIES}
  ${KCoreAddons_LIBRARIES}
  plasma
@@ -85,7 +85,7 @@ target_link_libraries(plasma-shell
  ${Qt5Script_LIBRARIES}
  ${KDE4Support_LIBRARIES}
  ${Solid_LIBRARIES}
- KDeclarative
+ KF5::KDeclarative
  KF5::KI18n
  KF5::XmlGui
 )