[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=eb1d021

The following commit has been merged in the master branch:
commit eb1d021715c96908af4dcd003a6e73e6217f1eaa
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Nov 12 16:34:58 2014 +0100

    Fix the KAccounts cmake module
    
    Matches AccountsQt module now
---
 cmake/modules/FindKAccounts.cmake | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/cmake/modules/FindKAccounts.cmake b/cmake/modules/FindKAccounts.cmake
index ad12c01..4b6c829 100644
--- a/cmake/modules/FindKAccounts.cmake
+++ b/cmake/modules/FindKAccounts.cmake
@@ -7,21 +7,24 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 SET (KACCOUNTS_FIND_REQUIRED ${KAccounts_FIND_REQUIRED})
-if (KACCOUNTS_INCLUDE_DIRS AND KACCOUNTS_LIBRARIES)
+if (KACCOUNTS_INCLUDE_DIR AND KACCOUNTS_LIBRARY)
   # Already in cache, be silent
   set(KACCOUNTS_FIND_QUIETLY TRUE)
-endif (KACCOUNTS_INCLUDE_DIRS AND KACCOUNTS_LIBRARIES)
+endif (KACCOUNTS_INCLUDE_DIR AND KACCOUNTS_LIBRARY)
 
-find_path(KACCOUNTS_INCLUDE_DIRS
+find_path(KACCOUNTS_INCLUDE_DIR
   NAMES KAccounts/kaccountsuiplugin.h
-  PATHS ${KF5_INCLUDE_DIR}
+  PATHS ${CMAKE_INSTALL_FULL_INCLUDEDIR}
 )
 
-find_library(KACCOUNTS_LIBRARIES NAMES kaccounts)
+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_LIBRARIES
-                                  KACCOUNTS_INCLUDE_DIRS)
+                                  KACCOUNTS_LIBRARY
+                                  KACCOUNTS_INCLUDE_DIR)
 
-mark_as_advanced(KACCOUNTS_INCLUDE_DIRS KACCOUNTS_LIBRARIES)
+mark_as_advanced(KACCOUNTS_INCLUDE_DIR KACCOUNTS_LIBRARY)

-- 
ktp-common-internals packaging