[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:06:28 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=2f90fa4
The following commit has been merged in the master branch:
commit 2f90fa4466c4137dca24da3fef1304b1d397f579
Author: Martin Klapetek <mklapetek at kde.org>
Date: Mon Mar 9 14:40:03 2015 +0100
Use the installed cmake file for KAccounts
---
cmake/modules/FindKAccounts.cmake | 30 ------------------------------
plugins/kaccounts/CMakeLists.txt | 3 +--
2 files changed, 1 insertion(+), 32 deletions(-)
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)
diff --git a/plugins/kaccounts/CMakeLists.txt b/plugins/kaccounts/CMakeLists.txt
index f5828c8..3504d0f 100644
--- a/plugins/kaccounts/CMakeLists.txt
+++ b/plugins/kaccounts/CMakeLists.txt
@@ -2,7 +2,6 @@ project (ktpaccountskcm-plugin-kaccounts)
include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${KACCOUNTS_INCLUDE_DIR}
${ACCOUNTSQT_INCLUDE_DIRS}
${SIGNONQT_INCLUDE_DIRS}
@@ -22,7 +21,7 @@ target_link_libraries (ktpaccountskcm_plugin_kaccounts
Qt5::Widgets
KF5::TextWidgets
${TELEPATHY_QT5_LIBRARIES}
- ${KACCOUNTS_LIBRARIES}
+ KAccounts
${ACCOUNTSQT_LIBRARIES}
${SIGNONQT_LIBRARIES}
)
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list