[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=d7d2d1e

The following commit has been merged in the master branch:
commit d7d2d1e5bb1b892d48b0583457837d41e2d5bc78
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Aug 6 13:01:33 2014 +0200

    CMake Frameworks plumbing for KCMTelepathyAccounts library
---
 src/KCMTelepathyAccounts/CMakeLists.txt | 42 +++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/KCMTelepathyAccounts/CMakeLists.txt b/src/KCMTelepathyAccounts/CMakeLists.txt
index e19f3ac..511ca38 100644
--- a/src/KCMTelepathyAccounts/CMakeLists.txt
+++ b/src/KCMTelepathyAccounts/CMakeLists.txt
@@ -59,23 +59,29 @@ set (libktpaccountskcminternal_PRETTY_HDRS
      ValidatedLineEdit
 )
 
-kde4_add_ui_files (libktpaccountskcminternal_SRCS
-                   account-edit-widget.ui
-                   parameter-edit-widget.ui
-                   profile-select-widget.ui
-                   simple-profile-select-widget.ui
+ki18n_wrap_ui (libktpaccountskcminternal_SRCS
+               account-edit-widget.ui
+               parameter-edit-widget.ui
+               profile-select-widget.ui
+               simple-profile-select-widget.ui
 )
 
-kde4_add_library (ktpaccountskcminternal
-                  SHARED
-                  ${libktpaccountskcminternal_SRCS}
+add_library(ktpaccountskcminternal
+            SHARED
+            ${libktpaccountskcminternal_SRCS}
 )
 
 target_link_libraries (ktpaccountskcminternal
-                       ${QT_LIBRARIES}
-                       ${KDE4_KDEUI_LIBS}
-                       ${KDE4_KIO_LIBS}
-                       ${TELEPATHY_QT4_LIBRARIES}
+                       Qt5::Widgets
+                       Qt5::Core
+#                        KF5::KIO
+                       KF5::I18n
+                       KF5::WidgetsAddons
+                       KF5::ConfigWidgets
+                       KF5::ItemViews
+                       KF5::IconThemes
+                       KF5::Service
+                       ${TELEPATHY_QT5_LIBRARIES}
 )
 
 
@@ -95,12 +101,12 @@ install (TARGETS ktpaccountskcminternal
          ${INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
-#install (FILES
-#         ${libktpaccountskcminternal_HDRS}
-#         ${libktpaccountskcminternal_PRETTY_HDRS}
-#         kcm_telepathy_accounts_export.h
-#         DESTINATION ${INCLUDE_INSTALL_DIR}/KCMTelepathyAccounts COMPONENT Devel
-#)
+install (FILES
+        ${libktpaccountskcminternal_HDRS}
+        ${libktpaccountskcminternal_PRETTY_HDRS}
+        kcm_telepathy_accounts_export.h
+        DESTINATION ${INCLUDE_INSTALL_DIR}/KCMTelepathyAccounts COMPONENT Devel
+)
 
 install (FILES
          ktpaccountskcminternal-accountuiplugin.desktop

-- 
ktp-accounts-kcm packaging