[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:19:22 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=5f76e32
The following commit has been merged in the master branch:
commit 5f76e327b0bef6ab07168218064daa28eba989a9
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Jun 16 15:59:06 2011 +0200
Update FindTelepathyQt4.cmake and search for Tp-Qt4 >= 0.7.1
---
CMakeLists.txt | 2 +-
cmake/modules/FindTelepathyQt4.cmake | 15 +++++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccbd803..45594a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set (CMAKE_MODULE_PATH
set(KDE_MIN_VERSION "4.4.75")
find_package (KDE4 ${KDE_MIN_VERSION} REQUIRED)
-find_package (TelepathyQt4 REQUIRED)
+find_package (TelepathyQt4 0.7.1 REQUIRED)
include (CheckIncludeFiles)
include (KDE4Defaults)
diff --git a/cmake/modules/FindTelepathyQt4.cmake b/cmake/modules/FindTelepathyQt4.cmake
index cc183b6..c7f8f91 100644
--- a/cmake/modules/FindTelepathyQt4.cmake
+++ b/cmake/modules/FindTelepathyQt4.cmake
@@ -1,7 +1,7 @@
-# Try to find the Qt binding of the Telepathy library
-# TELEPATHY_QT_FOUND - system has TelepathyQt4
-# TELEPATHY_QT_INCLUDE_DIR - the TelepathyQt4 include directory
-# TELEPATHY_QT_LIBRARIES - Link these to use TelepathyQt4
+# Try to find the Qt4 binding of the Telepathy library
+# TELEPATHY_QT4_FOUND - system has TelepathyQt4
+# TELEPATHY_QT4_INCLUDE_DIR - the TelepathyQt4 include directory
+# TELEPATHY_QT4_LIBRARIES - Link these to use TelepathyQt4
# Copyright (c) 2008, Allen Winter <winter at kde.org>
# Copyright (c) 2009, Andre Moreira Magalhaes <andrunko at gmail.com>
@@ -17,7 +17,11 @@ endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
find_package(PkgConfig)
if(PKG_CONFIG_FOUND)
- pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=0.5.16)
+ if (TelepathyQt4_FIND_VERSION_EXACT)
+ pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4=${TelepathyQt4_FIND_VERSION})
+ else (TelepathyQt4_FIND_VERSION_EXACT)
+ pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=${TelepathyQt4_FIND_VERSION})
+ endif (TelepathyQt4_FIND_VERSION_EXACT)
endif(PKG_CONFIG_FOUND)
find_path(TELEPATHY_QT4_INCLUDE_DIR
@@ -25,7 +29,6 @@ find_path(TELEPATHY_QT4_INCLUDE_DIR
HINTS
${PC_TELEPATHY_QT4_INCLUDEDIR}
${PC_TELEPATHY_QT4_INCLUDE_DIRS}
- ${PC_TELEPATHY_QT4_INCLUDES}
)
find_library(TELEPATHY_QT4_LIBRARIES
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list