[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=8d36b81

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

    Make the OTR stuff build conditionally
    
    It requires telepathy-qt >= 0.9.5 and we're not allowed to raise the
    version now
---
 CMakeLists.txt     | 2 +-
 KTp/CMakeLists.txt | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f88bcd6..551e956 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
+if (LIBOTR_FOUND AND LIBGCRYPT_FOUND AND TelepathyQt5_VERSION VERSION_GREATER "0.9.4")
     set(OTR_LIBS_FOUND TRUE)
 endif ()
 
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index b4a8bf3..7f13e7f 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -115,7 +115,10 @@ add_subdirectory(Declarative)
 add_subdirectory(Models)
 add_subdirectory(Widgets)
 add_subdirectory(Logger)
-add_subdirectory(OTR)
+
+if (OTR_LIBS_FOUND)
+    add_subdirectory(OTR)
+endif (OTR_LIBS_FOUND)
 
 # API docs
 find_package(Doxygen)

-- 
ktp-common-internals packaging