diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-09-07 09:04:18 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-09-07 13:48:39 +0200 |
| commit | 57332356a0d3c1afa447a3b59b4050fcb0d5b98d (patch) | |
| tree | 8877b371f398bb87c58d63122d3c12d960fea451 /src/multimedia | |
| parent | 8d5182d03c1967d77ca8da531b004e85bb0892f0 (diff) | |
Only search for and link EGL if we have gstreamer and opengl
Fixes: QTBUG-96251
Pick-to: 6.2
Change-Id: Id4aea9db83b54ba150c7d10ea443c48e6f2e5405
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/CMakeLists.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/multimedia/CMakeLists.txt b/src/multimedia/CMakeLists.txt index b7d7a8b0d..e09b47f91 100644 --- a/src/multimedia/CMakeLists.txt +++ b/src/multimedia/CMakeLists.txt @@ -189,8 +189,6 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_wmf wmcodecdspuuid ) -qt_find_package(EGL) - qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer SOURCES platform/gstreamer/audio/qgstreameraudiodevice.cpp platform/gstreamer/audio/qgstreameraudiodevice_p.h @@ -228,7 +226,6 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer LIBRARIES GStreamer::GStreamer # special case GStreamer::App # special case - EGL::EGL ) qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND QT_FEATURE_gstreamer_photography @@ -236,9 +233,14 @@ qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND QT_FEATU -lgstphotography-1.0#GStreamer::Photography # special case ) +if (QT_FEATURE_gstreamer AND QT_FEATURE_gstreamer_gl) + qt_find_package(EGL) +endif() + qt_internal_extend_target(Multimedia CONDITION QT_FEATURE_gstreamer AND QT_FEATURE_gstreamer_gl LIBRARIES GStreamer::Gl # special case + EGL::EGL ) qt_internal_extend_target(Multimedia CONDITION ANDROID AND QT_FEATURE_gstreamer |