telepathy-qt: start updating TelepathyQt to use newer farstream

David Edmundson davidedmundson at kemper.freedesktop.org
Fri Jul 25 04:02:26 PDT 2014


Module: telepathy-qt
Branch: master
Commit: 290f659ff5fbb8ad7889c56769e55ec31ecf75c8
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=290f659ff5fbb8ad7889c56769e55ec31ecf75c8

Author: Diane Trout <diane at ghic.org>
Date:   Wed Jan 15 22:29:00 2014 -0800

start updating TelepathyQt to use newer farstream

---

 cmake/modules/FindFarstream.cmake |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/modules/FindFarstream.cmake b/cmake/modules/FindFarstream.cmake
index de42c29..33139c3 100644
--- a/cmake/modules/FindFarstream.cmake
+++ b/cmake/modules/FindFarstream.cmake
@@ -23,9 +23,9 @@ if (NOT WIN32)
     # in the find_path() and find_library() calls
     find_package(PkgConfig)
     if (FARSTREAM_MIN_VERSION)
-        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION})
+        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2>=${FARSTREAM_MIN_VERSION})
     else (FARSTREAM_MIN_VERSION)
-        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1)
+        PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2)
     endif (FARSTREAM_MIN_VERSION)
     set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER})
 endif (NOT WIN32)
@@ -34,10 +34,10 @@ find_path(FARSTREAM_INCLUDE_DIR farstream/fs-conference.h
    PATHS
    ${PC_FARSTREAM_INCLUDEDIR}
    ${PC_FARSTREAM_INCLUDE_DIRS}
-   PATH_SUFFIXES farstream-0.1
+   PATH_SUFFIXES farstream-0.2
    )
 
-find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1
+find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2
    PATHS
    ${PC_FARSTREAM_LIBDIR}
    ${PC_FARSTREAM_LIBRARY_DIRS}



More information about the telepathy-commits mailing list