[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:08:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=6b0a08c
The following commit has been merged in the master branch:
commit 6b0a08c6348859feb8b72441d13fbb8862d74b39
Author: Martin Klapetek <mklapetek at kde.org>
Date: Mon Jun 8 22:46:33 2015 +0200
[kaccounts] The plugin now also requires SignOnQt
---
CMakeLists.txt | 5 +++--
kaccounts/CMakeLists.txt | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbe39f8..7ef13c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@ find_package (KF5People 0.5)
find_package (KAccounts)
find_package (AccountsQt5 1.10 CONFIG)
+find_package (SignOnQt5 8.55 CONFIG)
find_package (LibOTR 4.0.0)
find_package (Libgcrypt)
@@ -90,8 +91,8 @@ if (KF5People_FOUND)
endif ()
#If we find KAccounts library, build the plugin for it
-if (KAccounts_FOUND AND AccountsQt5_FOUND)
- include_directories(${ACCOUNTSQT_INCLUDE_DIRS})
+if (KAccounts_FOUND AND AccountsQt5_FOUND AND SignOnQt5_FOUND)
+ include_directories(${ACCOUNTSQT_INCLUDE_DIRS} ${SIGNONQT_INCLUDE_DIRS})
add_subdirectory(kaccounts)
endif ()
diff --git a/kaccounts/CMakeLists.txt b/kaccounts/CMakeLists.txt
index 28d9902..a89febb 100644
--- a/kaccounts/CMakeLists.txt
+++ b/kaccounts/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(kaccounts_ktp_plugin
KTp::Logger
KAccounts
${ACCOUNTSQT_LIBRARIES}
+ ${SIGNONQT_LIBRARIES}
)
# Install:
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list