[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

Fri Oct 14 14:27:41 UTC 2016

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=bf272ea

The following commit has been merged in the master branch:
commit bf272ea3e72f45883ae5de32a3e73b7e86de7127
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Jun 18 02:39:30 2014 +0200

    Remove usage of KDE4_ variables
---
 cli/CMakeLists.txt                   | 2 +-
 interfaces/CMakeLists.txt            | 2 +-
 kcm/CMakeLists.txt                   | 2 +-
 plugins/battery/CMakeLists.txt       | 2 +-
 plugins/notifications/CMakeLists.txt | 2 +-
 plugins/pausemusic/CMakeLists.txt    | 2 +-
 plugins/ping/CMakeLists.txt          | 2 +-
 plugins/sftp/CMakeLists.txt          | 4 ++--
 plugins/share/CMakeLists.txt         | 2 +-
 plugins/telephony/CMakeLists.txt     | 2 +-
 tests/CMakeLists.txt                 | 1 -
 11 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index 1c368a1..3297abe 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -2,6 +2,6 @@ include_directories(${CMAKE_SOURCE_DIR})
 
 add_executable(kdeconnect-cli kdeconnect-cli.cpp)
 
-target_link_libraries(kdeconnect-cli kdeconnectinterfaces Qt5::Gui ${KDE4_KDEUI_LIBS})
+target_link_libraries(kdeconnect-cli kdeconnectinterfaces Qt5::Gui KF5::KDELibs4Support)
 
 install(TARGETS kdeconnect-cli ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index cc5f06c..bfe03a0 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -70,9 +70,9 @@ add_dependencies(kdeconnectinterfaces
 )
 
 target_link_libraries(kdeconnectinterfaces
-    ${KDE4_KDEUI_LIBS}
     Qt5::Core
     Qt5::DBus
+    KF5::KDELibs4Support
     
     ${QJSON_LIBRARIES}
 )
diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
index 92f04be..0151b0d 100644
--- a/kcm/CMakeLists.txt
+++ b/kcm/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library(kcm_kdeconnect MODULE ${kcm_SRCS})
 target_link_libraries(kcm_kdeconnect
     Qt5::Core
     Qt5::Gui
-    ${KDE4_KDEUI_LIBRARY}
+    KF5::KDELibs4Support
     KF5::KCMUtils
     kdeconnectinterfaces
 )
diff --git a/plugins/battery/CMakeLists.txt b/plugins/battery/CMakeLists.txt
index 2448463..e140cd9 100644
--- a/plugins/battery/CMakeLists.txt
+++ b/plugins/battery/CMakeLists.txt
@@ -5,7 +5,7 @@ set(kdeconnect_battery_SRCS
 
 add_library(kdeconnect_battery MODULE ${kdeconnect_battery_SRCS})
 
-target_link_libraries(kdeconnect_battery kdeconnectcore ${KDE4_KDEUI_LIBS})
+target_link_libraries(kdeconnect_battery kdeconnectcore KF5::KDELibs4Support)
 
 install(TARGETS kdeconnect_battery DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(FILES kdeconnect_battery.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/plugins/notifications/CMakeLists.txt b/plugins/notifications/CMakeLists.txt
index 9553648..8c3431b 100644
--- a/plugins/notifications/CMakeLists.txt
+++ b/plugins/notifications/CMakeLists.txt
@@ -6,7 +6,7 @@ set(kdeconnect_notifications_SRCS
 
 add_library(kdeconnect_notifications MODULE ${kdeconnect_notifications_SRCS})
 
-target_link_libraries(kdeconnect_notifications kdeconnectcore ${KDE4_KDEUI_LIBS})
+target_link_libraries(kdeconnect_notifications kdeconnectcore KF5::KDELibs4Support)
 
 install(TARGETS kdeconnect_notifications DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(FILES kdeconnect_notifications.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/plugins/pausemusic/CMakeLists.txt b/plugins/pausemusic/CMakeLists.txt
index 4bdb6ba..35dc677 100644
--- a/plugins/pausemusic/CMakeLists.txt
+++ b/plugins/pausemusic/CMakeLists.txt
@@ -21,7 +21,7 @@ qt5_wrap_ui( kdeconnect_pausemusic_config_SRCS pausemusic_config.ui )
 add_library(kdeconnect_pausemusic_config MODULE ${kdeconnect_pausemusic_config_SRCS} )
 target_link_libraries( kdeconnect_pausemusic_config
     
-    ${KDE4_KDEUI_LIBS}
+    KF5::KDELibs4Support
 )
 
 install( TARGETS kdeconnect_pausemusic_config DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/plugins/ping/CMakeLists.txt b/plugins/ping/CMakeLists.txt
index 506e587..9d66ef9 100644
--- a/plugins/ping/CMakeLists.txt
+++ b/plugins/ping/CMakeLists.txt
@@ -4,7 +4,7 @@ set(kdeconnect_ping_SRCS
 
 add_library(kdeconnect_ping MODULE ${kdeconnect_ping_SRCS})
 
-target_link_libraries(kdeconnect_ping kdeconnectcore ${KDE4_KDEUI_LIBS})
+target_link_libraries(kdeconnect_ping kdeconnectcore KF5::KDELibs4Support)
 
 install(TARGETS kdeconnect_ping DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(FILES kdeconnect_ping.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/plugins/sftp/CMakeLists.txt b/plugins/sftp/CMakeLists.txt
index 7f6588a..896e69b 100644
--- a/plugins/sftp/CMakeLists.txt
+++ b/plugins/sftp/CMakeLists.txt
@@ -6,7 +6,7 @@ set(kdeconnect_sftp_SRCS
 
 add_library(kdeconnect_sftp MODULE ${kdeconnect_sftp_SRCS})
 
-target_link_libraries(kdeconnect_sftp kdeconnectcore ${KDE4_KFILE_LIBS})
+target_link_libraries(kdeconnect_sftp kdeconnectcore KF5::File)
 
 install(TARGETS kdeconnect_sftp DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(FILES kdeconnect_sftp.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
@@ -29,7 +29,7 @@ qt5_wrap_ui( kdeconnect_sftp_config_SRCS sftp_config.ui )
 add_library(kdeconnect_sftp_config MODULE ${kdeconnect_sftp_config_SRCS} )
 target_link_libraries( kdeconnect_sftp_config
     
-    ${KDE4_KDEUI_LIBS}
+    KF5::KDELibs4Support
     KF5::KIOWidgets
 )
 
diff --git a/plugins/share/CMakeLists.txt b/plugins/share/CMakeLists.txt
index b919433..896d58a 100644
--- a/plugins/share/CMakeLists.txt
+++ b/plugins/share/CMakeLists.txt
@@ -20,7 +20,7 @@ qt5_wrap_ui( kdeconnect_share_config_SRCS share_config.ui )
 add_library(kdeconnect_share_config MODULE ${kdeconnect_share_config_SRCS} )
 target_link_libraries( kdeconnect_share_config
     
-    ${KDE4_KDEUI_LIBS}
+    KF5::KDELibs4Support
     KF5::KIOWidgets
 )
 
diff --git a/plugins/telephony/CMakeLists.txt b/plugins/telephony/CMakeLists.txt
index c26bd40..59ba9a7 100644
--- a/plugins/telephony/CMakeLists.txt
+++ b/plugins/telephony/CMakeLists.txt
@@ -4,7 +4,7 @@ set(kdeconnect_telephony_SRCS
 
 add_library(kdeconnect_telephony MODULE ${kdeconnect_telephony_SRCS})
 
-target_link_libraries(kdeconnect_telephony kdeconnectcore ${KDE4_KDEUI_LIBS})
+target_link_libraries(kdeconnect_telephony kdeconnectcore KF5::KDELibs4Support)
 
 install(TARGETS kdeconnect_telephony DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(FILES kdeconnect_telephony.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 711fbb0..70c1ce0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,7 +1,6 @@
 include_directories(
     ${QJSON_INCLUDE_DIR}
     ${QCA2_INCLUDE_DIR}
-    ${KDE4_INCLUDES}
     ${KDEConnectCore_BINARY_DIR}
     ${CMAKE_SOURCE_DIR}
 )

-- 
kdeconnect packaging

