diff options
| author | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-02-21 10:16:28 -0300 |
|---|---|---|
| committer | Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk> | 2011-02-21 10:16:48 -0300 |
| commit | 8a4775cd6edc2c11203dc98176c017ab0d625970 (patch) | |
| tree | 491808cd2badab8c1c05b587b2c2f7e9ca51c32b | |
| parent | 4f7072f3448664ddeba76ceb52bf1232b20d6d9c (diff) | |
| parent | 3ea55bd5c050e52334b6c9183f19616c9ba14b97 (diff) | |
Merge remote branch 'gkiagia/build-fix'
Reviewed-by: Andre Moreira Magalhaes (andrunko) <andre.magalhaes@collabora.co.uk>
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | TelepathyQt4Yell/Farstream/CMakeLists.txt | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 72f6a50..7e9ede1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,13 +163,6 @@ macro_log_feature(GSTREAMER_FOUND "GStreamer" "Needed, together with Tp-Farstream, to build telepathy-qt4-yell-farstream and some additional examples" "http://www.gstreamer.net/" FALSE) -# Build TelepathyQt4-Farstream only if GStreamer, TelepathyFarstream and all of their dependencies were found -if (TELEPATHYFARSTREAM_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) - set (FARSTREAM_COMPONENTS_FOUND 1) -else (TELEPATHYFARSTREAM_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) - set (FARSTREAM_COMPONENTS_FOUND 0) -endif (TELEPATHYFARSTREAM_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.13.0) find_package(TelepathyGlib) @@ -178,6 +171,13 @@ macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" "http://telepathy.freedesktop.org/" FALSE "0.13.0" "Needed, together with Qt Glib integration, to build most of the unit tests") +# Build TelepathyQt4-Farstream only if GStreamer, TelepathyFarstream and all of their dependencies were found +if (TELEPATHYFARSTREAM_FOUND AND TELEPATHYGLIB_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) + set (FARSTREAM_COMPONENTS_FOUND 1) +else (TELEPATHYFARSTREAM_FOUND AND TELEPATHYGLIB_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) + set (FARSTREAM_COMPONENTS_FOUND 0) +endif (TELEPATHYFARSTREAM_FOUND AND TELEPATHYGLIB_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND) + # Enable glib-based tests only if Qt4 has GLib support and Telepathy-glib was found if(QT4_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND) set(ENABLE_TP_GLIB_TESTS 1) diff --git a/TelepathyQt4Yell/Farstream/CMakeLists.txt b/TelepathyQt4Yell/Farstream/CMakeLists.txt index c374261..748d4c7 100644 --- a/TelepathyQt4Yell/Farstream/CMakeLists.txt +++ b/TelepathyQt4Yell/Farstream/CMakeLists.txt @@ -1,5 +1,6 @@ if(FARSTREAM_COMPONENTS_FOUND) include_directories(${TELEPATHY_FARSTREAM_INCLUDE_DIR} + ${TELEPATHY_GLIB_INCLUDE_DIR} ${GSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} @@ -37,6 +38,7 @@ if(FARSTREAM_COMPONENTS_FOUND) ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} ${TELEPATHY_FARSTREAM_LIBRARIES} + ${TELEPATHY_GLIB_LIBRARIES} ${GSTREAMER_INTERFACE_LIBRARY} telepathy-qt4-yell) |