From kde-commits Mon Jul 20 19:15:54 2009 From: George Kiagiadakis Date: Mon, 20 Jul 2009 19:15:54 +0000 To: kde-commits Subject: playground/network/kcall Message-Id: <1248117354.662304.6649.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=124811736411679 SVN commit 1000058 by gkiagia: Cleanup all CMakeLists.txt and make all dependencies required. M +14 -39 CMakeLists.txt M +1 -4 kcall_handler/CMakeLists.txt M +0 -1 kcm/CMakeLists.txt M +1 -4 libkgstdevices/CMakeLists.txt M +1 -0 libkgstvideowidget/abstractrenderer.cpp M +1 -0 libkgstvideowidget/videowidget.cpp M +1 -1 libkgstvideowidget/videowidget.h M +0 -17 libqtgstreamer/CMakeLists.txt --- trunk/playground/network/kcall/CMakeLists.txt #1000057:1000058 @@ -5,31 +5,15 @@ find_package(KDE4 REQUIRED) find_package(TelepathyQt4 REQUIRED) find_package(LibKNotificationItem-1 REQUIRED) - -macro_optional_find_package(GStreamer) -macro_log_feature(GSTREAMER_FOUND "GStreamer" "gstreamer 0.10 is required for kcall" - "http://gstreamer.freedesktop.org/modules/" FALSE "0.10") - -macro_optional_find_package(GObject) -macro_optional_find_package(GLIB2) -macro_log_feature(GOBJECT_FOUND "GObject" "GObject is required for kcall" - "http://www.gtk.org/download/" FALSE) - -macro_optional_find_package(TpFarsight) -macro_log_feature(TPFARSIGHT_FOUND "telepathy-farsight" "telepathy-farsight is required for kcall" - "http://telepathy.freedesktop.org/releases/telepathy-farsight/" FALSE "0.0.4") - - +find_package(GStreamer REQUIRED) +find_package(GObject REQUIRED) +find_package(GLIB2 REQUIRED) +find_package(TpFarsight REQUIRED) # dbus-glib and libxml2 are not really used, but headers from other libs include stuff from those, # so we need their INCLUDE_DIR variable -macro_optional_find_package(DbusGlib) -macro_log_feature(DBUSGLIB_FOUND "dbus-glib" "dbus-glib is required for kcall" - "http://dbus.freedesktop.org/releases/dbus-glib/" FALSE) +find_package(DbusGlib REQUIRED) +find_package(LibXml2 REQUIRED) -macro_optional_find_package(LibXml2) -macro_log_feature(LIBXML2_FOUND "LibXml2" "LibXml2 is required for kcall" - "http://xmlsoft.org/downloads.html" FALSE) - include(CheckCXXSourceCompiles) set(CMAKE_REQUIRED_INCLUDES ${KDE4_INCLUDES}) check_cxx_source_compiles(" @@ -47,29 +31,21 @@ message(STATUS "WARNING: Qt4 is compiled without glib support. kcall will not work properly!") endif (NOT QT4_GLIB_SUPPORT) -if (GSTREAMER_FOUND AND GOBJECT_FOUND AND TPFARSIGHT_FOUND AND DBUSGLIB_FOUND AND LIBXML2_FOUND) - set(BUILD_KCALL_HANDLER TRUE) -else (GSTREAMER_FOUND AND GOBJECT_FOUND AND TPFARSIGHT_FOUND AND DBUSGLIB_FOUND AND LIBXML2_FOUND) - set(BUILD_KCALL_HANDLER FALSE) -endif (GSTREAMER_FOUND AND GOBJECT_FOUND AND TPFARSIGHT_FOUND AND DBUSGLIB_FOUND AND LIBXML2_FOUND) - include_directories(${KDE4_INCLUDES} ${TELEPATHY_QT4_INCLUDE_DIR} ${KNOTIFICATIONITEM_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) add_definitions(${KDE4_DEFINITIONS}) - add_subdirectory(libkcallprivate) +add_subdirectory(libkgstvideowidget) +add_subdirectory(libqtgstreamer) +add_subdirectory(libkgstdevices) +add_subdirectory(libqtpfarsight) +add_subdirectory(kcall_handler) +add_subdirectory(kcm) +add_subdirectory(tests) -if ( BUILD_KCALL_HANDLER ) - add_subdirectory(libkgstvideowidget) - add_subdirectory(libqtgstreamer) - add_subdirectory(libkgstdevices) - add_subdirectory(libqtpfarsight) - add_subdirectory(kcall_handler) - add_subdirectory(kcm) - add_subdirectory(tests) -endif ( BUILD_KCALL_HANDLER ) +########## set(kcall_SRCS main.cpp @@ -89,5 +65,4 @@ kcallprivate) install(TARGETS kcall ${INSTALL_TARGETS_DEFAULT_ARGS}) -#install(FILES kcallui.rc DESTINATION ${DATA_INSTALL_DIR}/kcall) install(FILES kcall.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kcall) --- trunk/playground/network/kcall/kcall_handler/CMakeLists.txt #1000057:1000058 @@ -1,8 +1,5 @@ +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${GSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${DBUSGLIB_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} ${TPFARSIGHT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}) - set(kcall_handler_SRCS main.cpp callwindow.cpp --- trunk/playground/network/kcall/kcm/CMakeLists.txt #1000057:1000058 @@ -1,4 +1,3 @@ - include_directories(${CMAKE_CURRENT_BINARY_DIR}) kde4_add_plugin(kcm_kcalldevices kcmkcalldevices.cpp) --- trunk/playground/network/kcall/libkgstdevices/CMakeLists.txt #1000057:1000058 @@ -1,5 +1,4 @@ -include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) -add_definitions(${KDE4_DEFINITIONS}) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) set(kgstdevices_SRCS devicemanager.cpp @@ -10,5 +9,3 @@ add_definitions(-fPIC) kde4_add_ui_files(kgstdevices_SRCS tabledevicechooser.ui) kde4_add_library(kgstdevices STATIC ${kgstdevices_SRCS}) -#set_target_properties(kgstdevices PROPERTIES SOVERSION 0 VERSION 0.0.1) -#target_link_libraries(kgstdevices ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} -lQtGstreamer) --- trunk/playground/network/kcall/libkgstvideowidget/abstractrenderer.cpp #1000057:1000058 @@ -16,6 +16,7 @@ */ #include "abstractrenderer.h" +#include AbstractRenderer::~AbstractRenderer() { --- trunk/playground/network/kcall/libkgstvideowidget/videowidget.cpp #1000057:1000058 @@ -21,6 +21,7 @@ //#include "glrenderer.h" //#include "widgetrenderer.h" #include "x11renderer.h" +#include VideoWidget::VideoWidget(QWidget *parent) : QWidget(parent), --- trunk/playground/network/kcall/libkgstvideowidget/videowidget.h #1000057:1000058 @@ -19,7 +19,7 @@ #define VIDEOWIDGET_H #include -#include +typedef struct _GstElement GstElement; class AbstractRenderer; class VideoWidget : public QWidget --- trunk/playground/network/kcall/libqtgstreamer/CMakeLists.txt #1000057:1000058 @@ -13,22 +13,5 @@ qgstbus.cpp ) -set(QtGstreamer_HEADERS - qgstglobal.h - qgstobject.h - qgstelement.h - qgstbin.h - qgstpipeline.h - qgstelementfactory.h - qgstpad.h - qgstghostpad.h - qgstbus.h -) - add_definitions(-fPIC) kde4_add_library(QtGstreamer STATIC ${QtGstreamer_SRCS}) -#set_target_properties(QtGstreamer PROPERTIES SOVERSION 0 VERSION 0.0.1) -#target_link_libraries(QtGstreamer ${QT_QTCORE_LIBRARY} ${GSTREAMER_LIBRARIES} ${GOBJECT_LIBRARIES}) - -#install(TARGETS QtGstreamer DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) -#install(FILES ${QtGstreamer_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/QtGstreamer)