diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | TelepathyQt4/CMakeLists.txt | 20 | ||||
| -rw-r--r-- | tests/lib/glib/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | tests/lib/glib/csh/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/lib/glib/echo2/CMakeLists.txt | 2 |
5 files changed, 43 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bc5cbcf9..8faa8eb3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ cmake_minimum_required(VERSION 2.6) # set nano_version to 1 set(TP_QT4_MAJOR_VERSION 0) set(TP_QT4_MINOR_VERSION 3) -set(TP_QT4_MICRO_VERSION 2) +set(TP_QT4_MICRO_VERSION 5) set(TP_QT4_NANO_VERSION 1) set(PACKAGE_NAME telepathy-qt4) @@ -178,11 +178,11 @@ else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FO endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) # Find telepathy-glib -set(TELEPATHY_GLIB_MIN_VERSION 0.10.0) +set(TELEPATHY_GLIB_MIN_VERSION 0.11.3) find_package(TelepathyGlib) macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" "Glib bindings for Telepathy" - "http://telepathy.freedesktop.org/" FALSE "0.10.0" + "http://telepathy.freedesktop.org/" FALSE "0.11.3" "Needed, together with Qt Glib integration, to build some additional test cases") find_program(GLIB_GENMARSHAL glib-genmarshal) diff --git a/TelepathyQt4/CMakeLists.txt b/TelepathyQt4/CMakeLists.txt index 670c1bf1..b62c8e49 100644 --- a/TelepathyQt4/CMakeLists.txt +++ b/TelepathyQt4/CMakeLists.txt @@ -5,6 +5,8 @@ set(telepathy_qt4_SRCS abstract-interface.cpp account.cpp account-manager.cpp + account-set.cpp + account-set-internal.h capabilities-base.cpp channel.cpp channel-dispatcher.cpp @@ -47,6 +49,7 @@ set(telepathy_qt4_SRCS pending-channel-request-internal.h pending-connection.cpp pending-contact-attributes.cpp + pending-contact-info.cpp pending-contacts.cpp pending-handles.cpp pending-operation.cpp @@ -58,10 +61,12 @@ set(telepathy_qt4_SRCS ready-object.cpp referenced-handles.cpp room-list-channel.cpp + shared-ptr.cpp streamed-media-channel.cpp streamed-media-channel-internal.h text-channel.cpp - types.cpp) + types.cpp + types-internal.h) set(telepathy_qt4_HEADERS AbstractClient @@ -77,6 +82,8 @@ set(telepathy_qt4_HEADERS AccountManager account-manager.h AccountManagerInterface + AccountSet + account-set.h CapabilitiesBase capabilities-base.h Channel @@ -121,11 +128,18 @@ set(telepathy_qt4_HEADERS connection.h ConnectionInterface ConnectionInterfaceAliasingInterface + ConnectionInterfaceAnonymityInterface ConnectionInterfaceAvatarsInterface + ConnectionInterfaceBalanceInterface ConnectionInterfaceCapabilitiesInterface + ConnectionInterfaceCellularInterface + ConnectionInterfaceContactCapabilitiesInterface + ConnectionInterfaceContactInfoInterface ConnectionInterfaceContactsInterface + ConnectionInterfaceLocationInterface ConnectionInterfacePresenceInterface ConnectionInterfaceRequestsInterface + ConnectionInterfaceServicePointInterface ConnectionInterfaceSimplePresenceInterface ConnectionManager connection-manager.h @@ -188,6 +202,8 @@ set(telepathy_qt4_HEADERS pending-connection.h PendingContactAttributes pending-contact-attributes.h + PendingContactInfo + pending-contact-info.h PendingContacts pending-contacts.h PendingFailure @@ -256,6 +272,8 @@ set(telepathy_qt4_MOC_SRCS abstract-interface.h account.h account-manager.h + account-set.h + account-set-internal.h channel.h channel-dispatch-operation.h channel-request.h diff --git a/tests/lib/glib/CMakeLists.txt b/tests/lib/glib/CMakeLists.txt index 8a3d2440..35f035d3 100644 --- a/tests/lib/glib/CMakeLists.txt +++ b/tests/lib/glib/CMakeLists.txt @@ -17,10 +17,26 @@ if(ENABLE_TP_GLIB_TESTS) contacts-conn.c contacts-conn.h debug.h + params-cm.c + params-cm.h + simple-account.c + simple-account.h + simple-account-manager.c + simple-account-manager.h + simple-channel-dispatch-operation.c + simple-channel-dispatch-operation.h + simple-client.c + simple-client.h simple-conn.c simple-conn.h simple-manager.c - simple-manager.h) + simple-manager.h + textchan-group.c + textchan-group.h + textchan-null.c + textchan-null.h + util.c + util.h) add_library(tp-glib-tests SHARED ${tp_glib_tests_SRCS}) target_link_libraries(tp-glib-tests ${TELEPATHY_GLIB_LIBRARIES} example-cm-callable diff --git a/tests/lib/glib/csh/CMakeLists.txt b/tests/lib/glib/csh/CMakeLists.txt index 2a3f2483..23e2a662 100644 --- a/tests/lib/glib/csh/CMakeLists.txt +++ b/tests/lib/glib/csh/CMakeLists.txt @@ -2,6 +2,8 @@ if(ENABLE_TP_GLIB_TESTS) set(example_cm_csh_SRCS conn.c conn.h + connection-manager.c + connection-manager.h room.c room.h room-manager.c diff --git a/tests/lib/glib/echo2/CMakeLists.txt b/tests/lib/glib/echo2/CMakeLists.txt index 56ea3e71..40840412 100644 --- a/tests/lib/glib/echo2/CMakeLists.txt +++ b/tests/lib/glib/echo2/CMakeLists.txt @@ -3,6 +3,8 @@ if(ENABLE_TP_GLIB_TESTS) chan.c chan.h conn.c + connection-manager.c + connection-manager.h conn.h im-manager.c im-manager.h) |