Menu
▾
▴
[gst-cvs] qt-gstreamer: Fix linking with strict linkers such as gold.
|
From: <gk...@ke...> - 2011-01-08 18:05:08
|
Module: qt-gstreamer Branch: master Commit: a271a4788b455f9383c4878fbed3916818f537f4 URL: http://cgit.freedesktop.org/gstreamer/qt-gstreamer/commit/?id=a271a4788b455f9383c4878fbed3916818f537f4 Author: George Kiagiadakis <geo...@co...> Date: Sat Jan 8 11:41:42 2011 +0200 Fix linking with strict linkers such as gold. --- elements/CMakeLists.txt | 5 +++-- src/QGst/CMakeLists.txt | 2 +- src/QGst/QtGStreamer-0.10.pc.in | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/elements/CMakeLists.txt b/elements/CMakeLists.txt index c39cc5f..7d2a8ab 100644 --- a/elements/CMakeLists.txt +++ b/elements/CMakeLists.txt @@ -11,7 +11,8 @@ if (GSTREAMER_VIDEO_LIBRARY_FOUND) add_definitions(-DGST_DISABLE_XML -DGST_DISABLE_LOADSAVE) automoc4_add_library(gstqwidgetvideosink MODULE gstqwidgetvideosink.cpp) - target_link_libraries(gstqwidgetvideosink ${QT_QTGUI_LIBRARY} ${GSTREAMER_LIBRARY} - ${GOBJECT_LIBRARIES} ${GSTREAMER_VIDEO_LIBRARY}) + target_link_libraries(gstqwidgetvideosink ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} + ${GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARY} + ${GSTREAMER_VIDEO_LIBRARY}) install(TARGETS gstqwidgetvideosink DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/gstreamer-0.10) endif() diff --git a/src/QGst/CMakeLists.txt b/src/QGst/CMakeLists.txt index 9538379..5e5f693 100644 --- a/src/QGst/CMakeLists.txt +++ b/src/QGst/CMakeLists.txt @@ -128,7 +128,7 @@ automoc4_add_library(QtGStreamer ${SHARED_OR_STATIC} ${QtGStreamer_SRCS}) set_target_properties(QtGStreamer PROPERTIES OUTPUT_NAME QtGStreamer-${QTGSTREAMER_API_VERSION} SOVERSION ${QTGSTREAMER_SOVERSION} VERSION ${QTGSTREAMER_VERSION}) -target_link_libraries(QtGStreamer ${QT_QTCORE_LIBRARY} ${QTGLIB_LIBRARY} +target_link_libraries(QtGStreamer ${QT_QTCORE_LIBRARY} ${QTGLIB_LIBRARY} ${GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARY} ${GSTREAMER_INTERFACES_LIBRARY}) target_link_libraries(QtGStreamer LINK_INTERFACE_LIBRARIES ${QT_QTCORE_LIBRARY} ${QTGLIB_LIBRARY}) diff --git a/src/QGst/QtGStreamer-0.10.pc.in b/src/QGst/QtGStreamer-0.10.pc.in index 8af4b1b..fc7746b 100644 --- a/src/QGst/QtGStreamer-0.10.pc.in +++ b/src/QGst/QtGStreamer-0.10.pc.in @@ -6,7 +6,7 @@ includedir=@INCLUDES_INSTALL_DIR@ Name: QtGStreamer Description: Qt-style C++ bindings library for GStreamer Requires: QtGLib -Requires.private: gstreamer-0.10 gstreamer-interfaces-0.10 +Requires.private: gstreamer-0.10 gstreamer-interfaces-0.10 gobject-2.0 Version: @QTGSTREAMER_VERSION@ Cflags: -I${includedir} Libs: -L${libdir} -lQtGStreamer-0.10 |