Use more targets instead of variables

CMakeLists.txt

@@ -15,7 +15,7 @@ find_package(KF5 MODULE REQUIRED COMPONENTS CMake Compiler InstallDirs
     KCodecs KI18n KService KWidgetsAddons
     KWindowSystem KCrash Sonnet
     KArchive ItemModels KAuth KGuiAddons KConfigWidgets
-    ItemViews KNotifications KJS
+    ItemViews KNotifications KJS KPty
     KJobWidgets KIconThemes KCompletion KTextWidgets
     XmlGui Solid KWallet KIO KUnitConversion KBookmarks KDE4Attic
     KNotifyConfig

src/CMakeLists.txt

@@ -128,8 +128,7 @@ set(konsoleprivate_SRCS ${sessionadaptors_SRCS}
                         WindowSystemInfo.cpp
                         ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Window.xml
                         ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Session.xml)
-set(konsole_LIBS ${KDE4_KPTY_LIBS}
-                 ${X11_LIBRARIES}
+set(konsole_LIBS ${X11_LIBRARIES}
                  KF5::XmlGui
                  Qt5::PrintSupport
                  Qt5::Xml
@@ -141,8 +140,9 @@ set(konsole_LIBS ${KDE4_KPTY_LIBS}
                  KF5::KBookmarks
                  KF5::KI18n
                  KF5::KDE4Attic
+                 KF5::KPty
                  KDE4__KDE4Support
-                 ${KDE4_KIO_LIBRARY}
+                 KDE4__kio
                  KF5::KIOWidgets
 )
 

src/tests/CMakeLists.txt

@@ -9,8 +9,7 @@ set(KONSOLE_TEST_LIBS Qt5::Test konsoleprivate)
 ##  since make test is supposed to be fully automated.
 
 kde4_add_executable(PartManualTest TEST PartManualTest.cpp)
-target_link_libraries(PartManualTest XmlGui KParts
-                               ${KDE4_KPTY_LIBS}
+target_link_libraries(PartManualTest XmlGui KParts KPty
                                ${KONSOLE_TEST_LIBS})
 
 kde4_add_unit_test(CharacterColorTest CharacterColorTest.cpp)
@@ -26,8 +25,7 @@ target_link_libraries(HistoryTest ${KONSOLE_TEST_LIBS})
 
 if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     kde4_add_unit_test(PartTest PartTest.cpp)
-    target_link_libraries(PartTest XmlGui KParts
-                               ${KDE4_KPTY_LIBS}
+    target_link_libraries(PartTest XmlGui KParts KPty
                                ${KONSOLE_TEST_LIBS})
 endif()
 
@@ -35,7 +33,7 @@ kde4_add_unit_test(ProfileTest ProfileTest.cpp)
 target_link_libraries(ProfileTest ${KONSOLE_TEST_LIBS})
 
 kde4_add_unit_test(PtyTest PtyTest.cpp)
-target_link_libraries(PtyTest ${KDE4_KPTY_LIBS} ${KONSOLE_TEST_LIBS})
+target_link_libraries(PtyTest KPty ${KONSOLE_TEST_LIBS})
 
 ##kde4_add_unit_test(SessionManagerTest SessionManagerTest.cpp)
 ##target_link_libraries(SessionManagerTest ${KONSOLE_TEST_LIBS})