diff options
Diffstat (limited to 'src/plugins/multimedia')
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/plugins/multimedia/gstreamer/CMakeLists.txt | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt index 49775aa42..52c16306b 100644 --- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt +++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt @@ -64,6 +64,9 @@ qt_internal_add_plugin(QFFmpegMediaPlugin qt_internal_extend_target(QFFmpegMediaPlugin CONDITION QT_FEATURE_ffmpeg AND QT_FEATURE_vaapi SOURCES qffmpeghwaccel_vaapi.cpp qffmpeghwaccel_vaapi_p.h + NO_UNITY_BUILD_SOURCES + # Conflicts with macros defined in X11.h, and Xlib.h + qffmpeghwaccel_vaapi.cpp LIBRARIES VAAPI::VAAPI EGL::EGL diff --git a/src/plugins/multimedia/gstreamer/CMakeLists.txt b/src/plugins/multimedia/gstreamer/CMakeLists.txt index b2ebd4cef..96b9d3a22 100644 --- a/src/plugins/multimedia/gstreamer/CMakeLists.txt +++ b/src/plugins/multimedia/gstreamer/CMakeLists.txt @@ -34,6 +34,10 @@ qt_internal_add_plugin(QGstreamerMediaPlugin mediacapture/qgstreamerimagecapture.cpp mediacapture/qgstreamerimagecapture_p.h mediacapture/qgstreamermediacapture.cpp mediacapture/qgstreamermediacapture_p.h mediacapture/qgstreamermediaencoder.cpp mediacapture/qgstreamermediaencoder_p.h + NO_UNITY_BUILD_SOURCES + # Conflicts with macros defined in X11.h, and Xlib.h + common/qgstvideobuffer.cpp + common/qgstreamervideosink.cpp DEFINES GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 INCLUDE_DIRECTORIES @@ -47,9 +51,6 @@ qt_internal_add_plugin(QGstreamerMediaPlugin GStreamer::App ) -set_source_files_properties(common/qgstreamervideosink.cpp # X headers - PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) - qt_internal_extend_target(QGstreamerMediaPlugin CONDITION QT_FEATURE_gstreamer_photography LIBRARIES -lgstphotography-1.0 |