Hi, Kopete Team
Here is the patch for your review, that improves searching of decibel on
the system.
More info is in this thread:
http://lists.kde.org/?l=kde-devel&m=123819277625437&w=2
The meat: to first search for decibel in CMAKE_INSTALL_PREFIX and then
use pkg-config
So Decibel is from trunk kdesupport package. So is QtTapioca and
QtTelepathyClient.
I finally reached building and there is a compilation problem in
~/devel/kde/build/kdenetwork/kopete/protocols/telepathy:
[ 0%] Built target kopete_telepathy_automoc
[ 0%] Built target kopete_automoc
[ 85%] Built target kopete
[ 85%] Building CXX object
kopete/protocols/telepathy/CMakeFiles/kopete_telepathy.dir/telepathyprotocol.o
In file included from
/home/lex/devel/kde/src/kdenetwork/kopete/protocols/telepathy/telepathyprotocol.cpp:18:
/home/lex/devel/kde/src/kdenetwork/kopete/protocols/telepathy/telepathyprotocol.h:66:
error: ‘Presence’ in class ‘QtTapioca::ContactBase’ does not name a type
/home/lex/devel/kde/src/kdenetwork/kopete/protocols/telepathy/telepathyprotocol.h:67:
error: ‘QtTapioca::ContactBase::Presence’ has not been declared
In file included from
/home/lex/devel/kde/src/kdenetwork/kopete/protocols/telepathy/telepathyprotocol.cpp:30:
/home/lex/devel/kde/src/kdenetwork/kopete/protocols/telepathy/telepathycontact.h:85:
error: ‘QtTapioca::ContactBase::Presence’ has not been declared
/home/lex/devel/kde/src/kdenetwork/kopete/libkopete/kopetecontact.h:236:
warning: ‘virtual QList<KAction*>*
Kopete::Contact::customContextMenuActions(Kopete::ChatSession*)’ was hidden
/home/lex/devel/kde/src/kdenetwork/kopete/protocols/telepathy/telepathycontact.h:55:
warning: by ‘virtual QList<KAction*>*
TelepathyContact::customContextMenuActions()’
/home/lex/devel/kde/src/kdenetwork/kopete/protocols/telepathy/telepathyprotocol.cpp:87:
warning: unused parameter ‘addressBookData’
/home/lex/devel/kde/src/kdenetwork/kopete/protocols/telepathy/telepathyprotocol.cpp:115:
error: ‘Presence’ in class ‘QtTapioca::ContactBase’ does not name a type
/home/lex/devel/kde/src/kdenetwork/kopete/protocols/telepathy/telepathyprotocol.cpp:134:
error: ‘Kopete::OnlineStatus TelepathyProtocol::telepathyStatusToKopete’
is not a static member of ‘class TelepathyProtocol’
/home/lex/devel/kde/src/kdenetwork/kopete/protocols/telepathy/telepathyprotocol.cpp:134:
error: ‘Presence’ is not a member of ‘QtTapioca::ContactBase’
/home/lex/devel/kde/src/kdenetwork/kopete/protocols/telepathy/telepathyprotocol.cpp:135:
error: expected ‘,’ or ‘;’ before ‘{’ token
make[2]: ***
[kopete/protocols/telepathy/CMakeFiles/kopete_telepathy.dir/telepathyprotocol.o]
Error 1
make[1]: ***
[kopete/protocols/telepathy/CMakeFiles/kopete_telepathy.dir/all] Error 2
make: *** [all] Error 2
I cannot find Presence type in Tapioca headers. Hope you will help
resolve this.
Thanks.
--- FindDecibel.cmake.orig 2009-03-27 22:35:18.000000000 +0200
+++ FindDecibel.cmake 2009-03-27 23:20:39.000000000 +0200
@@ -19,24 +19,39 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+# First try to find tapioca in the install prefix
+IF (NOT QT_TAPIOCA_INCLUDE_DIR)
+ find_path(QT_TAPIOCA_INCLUDE_DIR
+ NAMES QtTapioca/Channel QtTapioca/Connection
+ PATHS ${CMAKE_INSTALL_PREFIX}/include
+ )
+ENDIF (NOT QT_TAPIOCA_INCLUDE_DIR)
+
+IF (NOT QT_TAPIOCA_LIBRARY)
+ find_library(QT_TAPIOCA_LIBRARY
+ NAMES QtTapioca
+ PATHS ${CMAKE_INSTALL_PREFIX}/lib
+ )
+ENDIF (NOT QT_TAPIOCA_LIBRARY)
+
+# If not found, bless pkg-config
+IF (NOT QT_TAPIOCA_INCLUDE_DIR AND QT_TAPIOCA_LIBRARY)
+ IF (NOT WIN32)
+ find_package(PkgConfig)
+ pkg_check_modules(QTTAPIOCA QtTapioca)
+ ENDIF(NOT WIN32)
+
+ set(QT_TAPIOCA_INCLUDE_DIR ${QTTAPIOCA_INCLUDE_DIRS})
+ FIND_LIBRARY(QT_TAPIOCA_LIBRARY NAMES QtTapioca
+ PATHS
+ ${QTTAPIOCA_LIBRARY_DIRS}
+ NO_DEFAULT_PATH
+ )
+ set(DECIBEL_DEFINITIONS ${QTTAPIOCA_CFLAGS})
+ENDIF (NOT QT_TAPIOCA_INCLUDE_DIR AND QT_TAPIOCA_LIBRARY)
-IF (NOT WIN32)
-find_package(PkgConfig)
-pkg_check_modules(QTTAPIOCA QtTapioca)
-
-ENDIF(NOT WIN32)
-
-set(QT_TAPIOCA_INCLUDE_DIR ${QTTAPIOCA_INCLUDE_DIRS})
-
-set(DECIBEL_DEFINITIONS ${QTTAPIOCA_CFLAGS})
set(DECIBEL_INCLUDES ${QT_TAPIOCA_INCLUDE_DIR} )
-FIND_LIBRARY(QT_TAPIOCA_LIBRARY NAMES QtTapioca
- PATHS
- ${QTTAPIOCA_LIBRARY_DIRS}
- NO_DEFAULT_PATH
-)
-
set(DECIBEL_LIBRARIES ${QT_TAPIOCA_LIBRARY})
include(FindPackageHandleStandardArgs)
_______________________________________________
kopete-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kopete-devel
