Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 439198 | Differences between
and this patch

Collapse All | Expand All

(-)a/CMakeLists.txt (-21 / +3 lines)
Lines 7-15 Link Here
7
7
8
option(QTGSTREAMER_STATIC "Build QtGStreamer as a static library" OFF)
8
option(QTGSTREAMER_STATIC "Build QtGStreamer as a static library" OFF)
9
option(QTGSTREAMER_TESTS "Build QtGStreamer's tests" OFF)
9
option(QTGSTREAMER_TESTS "Build QtGStreamer's tests" OFF)
10
option(QTGSTREAMER_EXAMPLES "Build QtGStreamer's examples" ON)
10
option(QTGSTREAMER_EXAMPLES "Build QtGStreamer's examples" OFF)
11
option(QTGSTREAMER_CODEGEN "Build and use QtGStreamer's codegen" OFF)
11
option(QTGSTREAMER_CODEGEN "Build and use QtGStreamer's codegen" OFF)
12
option(USE_GST_PLUGIN_DIR "Install gstreamer plugins at the system location" ON)
12
option(USE_GST_PLUGIN_DIR "Install gstreamer plugins at the system location" OFF)
13
option(USE_QT_PLUGIN_DIR "Install qt plugins at the system location" ON)
13
option(USE_QT_PLUGIN_DIR "Install qt plugins at the system location" ON)
14
14
15
include(MacroLogFeature)
15
include(MacroLogFeature)
Lines 35-41 Link Here
35
35
36
# this just sets the QTGSTREAMER_* cmake variables
36
# this just sets the QTGSTREAMER_* cmake variables
37
set(BUILDING_QTGSTREAMER TRUE)
37
set(BUILDING_QTGSTREAMER TRUE)
38
find_package(QtGStreamer REQUIRED)
38
find_package(QtGStreamer)
39
39
40
if (${CMAKE_VERSION} VERSION_LESS "2.8.6")
40
if (${CMAKE_VERSION} VERSION_LESS "2.8.6")
41
    find_package(Automoc4)
41
    find_package(Automoc4)
Lines 54-77 Link Here
54
    endmacro()
54
    endmacro()
55
endif()
55
endif()
56
56
57
find_package(GStreamer 0.10.33 COMPONENTS base)
58
macro_log_feature(GSTREAMER_FOUND "GStreamer" "Required to build QtGStreamer"
59
                                  "http://gstreamer.freedesktop.org/" TRUE "0.10.33")
60
macro_log_feature(GSTREAMER_BASE_LIBRARY_FOUND "GStreamer base library"
61
                                               "Used for building the qwidgetvideosink element"
62
                                               "http://gstreamer.freedesktop.org/" FALSE "0.10.33")
63
64
find_package(GStreamerPluginsBase 0.10.33 COMPONENTS app interfaces video)
65
macro_log_feature(GSTREAMER_APP_LIBRARY_FOUND "GStreamer app library"
66
                                              "Required to build QtGStreamerUtils"
67
                                              "http://gstreamer.freedesktop.org/" TRUE "0.10.33")
68
macro_log_feature(GSTREAMER_INTERFACES_LIBRARY_FOUND "GStreamer interfaces library"
69
                                                "Required to build QtGStreamer"
70
                                                "http://gstreamer.freedesktop.org/" TRUE "0.10.33")
71
macro_log_feature(GSTREAMER_VIDEO_LIBRARY_FOUND "GStreamer video library"
72
                                                "Used for building the qwidgetvideosink element"
73
                                                "http://gstreamer.freedesktop.org/" FALSE "0.10.33")
74
75
find_package(GLIB2)
57
find_package(GLIB2)
76
macro_log_feature(GLIB2_FOUND "GLib" "Required to build QtGLib" "http://www.gtk.org/" TRUE)
58
macro_log_feature(GLIB2_FOUND "GLib" "Required to build QtGLib" "http://www.gtk.org/" TRUE)
77
59
(-)a/src/CMakeLists.txt (-12 lines)
Lines 48-65 Link Here
48
48
49
# Build the libraries
49
# Build the libraries
50
add_subdirectory(QGlib)
50
add_subdirectory(QGlib)
51
add_subdirectory(QGst)
52
53
# Build the qml plugin
54
if (QT_QTDECLARATIVE_FOUND)
55
    add_subdirectory(qml)
56
endif()
57
58
# Install the cmake scripts that are used to find the installed library from external projects
59
install(EXPORT ${EXPORT_TARGET_SET} DESTINATION ${LIB_INSTALL_DIR}/QtGStreamer)
60
install(FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindQtGStreamer.cmake
61
        DESTINATION ${LIB_INSTALL_DIR}/QtGStreamer
62
        RENAME QtGStreamerConfig.cmake)
63
51
64
# Install pkgconfig files
52
# Install pkgconfig files
65
file(GLOB_RECURSE PC_IN_FILES "*.pc.in")
53
file(GLOB_RECURSE PC_IN_FILES "*.pc.in")

Return to bug 439198