[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=4c9d826

The following commit has been merged in the master branch:
commit 4c9d8266ebba7925387910f2f067d029a9a6b26b
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Mar 9 14:43:53 2015 +0100

    Use the installed cmake file for KAccounts
---
 CMakeLists.txt                    |  3 +--
 cmake/modules/FindKAccounts.cmake | 30 ------------------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5a66c0..7be1688 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,6 @@ include(FeatureSummary)
 include_directories (${QCA_INCLUDE_DIR}
                      ${ACCOUNTSQT_INCLUDE_DIRS}
                      ${SIGNONQT_INCLUDE_DIRS}
-                     ${KACCOUNTS_INCLUDE_DIRS}
 )
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
@@ -68,7 +67,7 @@ set(ktp_auth_handler_LIBS
     qca-qt5
     ${ACCOUNTSQT_LIBRARIES}
     ${SIGNONQT_LIBRARIES}
-    ${KACCOUNTS_LIBRARIES}
+    KAccounts
     KF5::WidgetsAddons
     KF5::Wallet
     KF5::I18n
diff --git a/cmake/modules/FindKAccounts.cmake b/cmake/modules/FindKAccounts.cmake
deleted file mode 100644
index 4b6c829..0000000
--- a/cmake/modules/FindKAccounts.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# Try to find the KAccounts UI library
-#
-# Copyright (c) 2011, Dario Freddi <drf at kde.org>
-# Copyright (c) 2014, Martin Klapetek <mklapetek at kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-SET (KACCOUNTS_FIND_REQUIRED ${KAccounts_FIND_REQUIRED})
-if (KACCOUNTS_INCLUDE_DIR AND KACCOUNTS_LIBRARY)
-  # Already in cache, be silent
-  set(KACCOUNTS_FIND_QUIETLY TRUE)
-endif (KACCOUNTS_INCLUDE_DIR AND KACCOUNTS_LIBRARY)
-
-find_path(KACCOUNTS_INCLUDE_DIR
-  NAMES KAccounts/kaccountsuiplugin.h
-  PATHS ${CMAKE_INSTALL_FULL_INCLUDEDIR}
-)
-
-find_library(KACCOUNTS_LIBRARY NAMES kaccounts)
-
-set(KACCOUNTS_INCLUDE_DIRS ${KACCOUNTS_INCLUDE_DIR})
-set(KACCOUNTS_LIBRARIES ${KACCOUNTS_LIBRARY})
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(KAccounts DEFAULT_MSG
-                                  KACCOUNTS_LIBRARY
-                                  KACCOUNTS_INCLUDE_DIR)
-
-mark_as_advanced(KACCOUNTS_INCLUDE_DIR KACCOUNTS_LIBRARY)

-- 
ktp-auth-handler packaging