SVN commit 1179465 by gkiagia: Remove the embedded QtGStreamer copy. QtGstreamer has improved a lot lately and it will probably be ready for a stable release by the time we will integrate kcall in kde, so it will be shipped externally. M +2 -19 CMakeLists.txt D libqtgstreamer/CMakeLists.txt D libqtgstreamer/interfaces/qgstxoverlay.cpp D libqtgstreamer/interfaces/qgstxoverlay.h D libqtgstreamer/qgstbin.cpp D libqtgstreamer/qgstbin.h D libqtgstreamer/qgstbus.cpp D libqtgstreamer/qgstbus.h D libqtgstreamer/qgstcaps.cpp D libqtgstreamer/qgstcaps.h D libqtgstreamer/qgstdeclarations.h D libqtgstreamer/qgstelement.cpp D libqtgstreamer/qgstelement.h D libqtgstreamer/qgstelementfactory.cpp D libqtgstreamer/qgstelementfactory.h D libqtgstreamer/qgstghostpad.cpp D libqtgstreamer/qgstghostpad.h D libqtgstreamer/qgstglobal.cpp D libqtgstreamer/qgstglobal.h D libqtgstreamer/qgstmessage.cpp D libqtgstreamer/qgstmessage.h D libqtgstreamer/qgstminiobject.cpp D libqtgstreamer/qgstminiobject.h D libqtgstreamer/qgstobject.cpp D libqtgstreamer/qgstobject.h D libqtgstreamer/qgstpad.cpp D libqtgstreamer/qgstpad.h D libqtgstreamer/qgstpipeline.cpp D libqtgstreamer/qgstpipeline.h D libqtgstreamer/qgststructure.cpp D libqtgstreamer/qgststructure.h D libqtgstreamer/qgstvalue.cpp D libqtgstreamer/qgstvalue.h --- trunk/playground/network/kcall/CMakeLists.txt #1179464:1179465 @@ -5,6 +5,8 @@ find_package(KDE4 REQUIRED) find_package(TelepathyQt4 REQUIRED) find_package(TelepathyQt4Farsight REQUIRED) +find_package(QtGstreamer REQUIRED) + find_package(GStreamer REQUIRED) find_package(GObject REQUIRED) find_package(GLIB2 REQUIRED) @@ -14,24 +16,6 @@ find_package(DbusGlib REQUIRED) find_package(LibXml2 REQUIRED) -include(CheckCXXSourceCompiles) -set(CMAKE_REQUIRED_INCLUDES ${KDE4_INCLUDES}) -check_cxx_source_compiles(" -#include -int main() -{ -#if defined(QT_NO_GLIB) -#error \"Qt was compiled with Glib disabled\" -#endif -return 0; -}" -QT4_GLIB_SUPPORT) - -if (NOT QT4_GLIB_SUPPORT) - message(STATUS "WARNING: Qt4 is compiled without glib support. kcall will not work properly!") -endif (NOT QT4_GLIB_SUPPORT) - - include_directories(${KDE4_INCLUDES} ${TELEPATHY_QT4_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) add_definitions(${KDE4_DEFINITIONS}) @@ -41,7 +25,6 @@ add_definitions(-DUSE_TEST_DEVICES) add_subdirectory(libkcallprivate) -add_subdirectory(libqtgstreamer) add_subdirectory(libkgstdevices) add_subdirectory(libqtpfarsight) add_subdirectory(kcall_handler)