mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
|
diff -urB telepathy-qt/cmake/modules/FindFarstream.cmake new/cmake/modules/FindFarstream.cmake
|
||
|
|
--- telepathy-qt/cmake/modules/FindFarstream.cmake 2012-04-25 22:14:22.275967164 +0200
|
||
|
|
+++ new/cmake/modules/FindFarstream.cmake 2012-10-07 12:19:46.543103512 +0200
|
||
|
|
@@ -23,9 +23,9 @@
|
||
|
|
# 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 @@
|
||
|
|
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}
|