[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:47 UTC 2016


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

The following commit has been merged in the master branch:
commit 2edcdfde894de16b6e97631b572a782c07da8261
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Mar 12 12:42:28 2015 +0100

    Raise minimum required telepathy-qt to 0.9.5
---
 CMakeLists.txt     | 6 +++---
 KTp/CMakeLists.txt | 5 +----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 551e956..d20e150 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ find_package (Qt5 REQUIRED CONFIG COMPONENTS
               Qml
               Test)
 
-find_package (KF5 REQUIRED COMPONENTS 
+find_package (KF5 REQUIRED COMPONENTS
               CoreAddons
               Notifications
               KIO
@@ -24,7 +24,7 @@ find_package (KF5 REQUIRED COMPONENTS
               Wallet
               Config)
 
-set(REQUIRED_TPQT_VERSION 0.9.2.1)
+set(REQUIRED_TPQT_VERSION 0.9.5)
 
 find_package (TelepathyQt5 ${REQUIRED_TPQT_VERSION} REQUIRED)
 find_package (TelepathyQt5Service ${REQUIRED_TPQT_VERSION} REQUIRED) #used for the otr-proxy
@@ -36,7 +36,7 @@ find_package (AccountsQt5 1.10 CONFIG)
 find_package (LibOTR 4.0.0)
 find_package (Libgcrypt)
 
-if (LIBOTR_FOUND AND LIBGCRYPT_FOUND AND TelepathyQt5_VERSION VERSION_GREATER "0.9.4")
+if (LIBOTR_FOUND AND LIBGCRYPT_FOUND)
     set(OTR_LIBS_FOUND TRUE)
 endif ()
 
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 7f13e7f..b4a8bf3 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -115,10 +115,7 @@ add_subdirectory(Declarative)
 add_subdirectory(Models)
 add_subdirectory(Widgets)
 add_subdirectory(Logger)
-
-if (OTR_LIBS_FOUND)
-    add_subdirectory(OTR)
-endif (OTR_LIBS_FOUND)
+add_subdirectory(OTR)
 
 # API docs
 find_package(Doxygen)

-- 
ktp-common-internals packaging



More information about the pkg-kde-commits mailing list