[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 27 23:59:18 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=d6ba2c8
The following commit has been merged in the master branch:
commit d6ba2c8b518de59e9bc13b7ef0689594ea843fed
Author: Àlex Fiestas <afiestas at kde.org>
Date: Mon Jun 10 17:17:10 2013 +0200
Spaces and CMake coding style
---
CMakeLists.txt | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e85ce21..b669b52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@ find_package (TelepathyQt4 0.8.9 REQUIRED)
find_package (KTp REQUIRED)
find_package (QJSON REQUIRED)
find_package (QCA2 REQUIRED)
-find_package(AccountsQt)
-find_package(SignOnQt)
+find_package (AccountsQt)
+find_package (SignOnQt)
include (KDE4Defaults)
include (MacroLibrary)
@@ -67,12 +67,14 @@ set(ktp_auth_handler_LIBS
#If we find Accounts-SSO frameworks, add support for it
if(ACCOUNTSQT_FOUND AND SIGNONQT_FOUND)
+
add_definitions(-DHAVE_SSO)
set(ktp_auth_handler_SRCS
${ktp_auth_handler_SRCS}
x-telepathy-sso-operation.cpp
getcredentialsjob.cpp
)
+
set(ktp_auth_handler_LIBS
${ktp_auth_handler_LIBS}
${ACCOUNTSQT_LIBRARIES}
@@ -82,7 +84,7 @@ if(ACCOUNTSQT_FOUND AND SIGNONQT_FOUND)
include_directories(${ACCOUNTSQT_INCLUDE_DIRS}
${SIGNONQT_INCLUDE_DIRS}
)
-
+
endif(ACCOUNTSQT_FOUND AND SIGNONQT_FOUND)
configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
@@ -100,11 +102,11 @@ configure_file(org.freedesktop.Telepathy.Client.KTp.TLSHandler.service.in
${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service)
configure_file(org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service.in
- ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service)
+ ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service)
install(TARGETS ktp-auth-handler DESTINATION ${LIBEXEC_INSTALL_DIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.SASLHandler.service
- ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service
+ ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.ConfAuthObserver.service
DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.KTp.TLSHandler.service
DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
--
ktp-auth-handler packaging
More information about the pkg-kde-commits
mailing list