diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2024-04-22 17:51:43 +0200 |
|---|---|---|
| committer | Tim Blechmann <tim@klingt.org> | 2024-04-25 21:18:36 +0800 |
| commit | 63b5cdfd0c08ece0d756ce25dcba1a5731ae3a22 (patch) | |
| tree | d82a07acab0c6261cadabae50dc47642d9d5c435 /src/multimedia | |
| parent | b4d6ab3faeb5b1c3f64016ab99135c5739670685 (diff) | |
Ensure that EGL::EGL is promoted to global for the standalone QtMultimedia builds
Pick-to: 6.5 6.6 6.7
Change-Id: If3914fcfc52033bc377d47153bdd1a7f4ac1b401
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Tim Blechmann <tim@klingt.org>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/configure.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake index 7c3092a47..5fe25f172 100644 --- a/src/multimedia/configure.cmake +++ b/src/multimedia/configure.cmake @@ -22,7 +22,11 @@ qt_find_package(MMRendererCore PROVIDED_TARGETS MMRendererCore::MMRendererCore M qt_find_package(MMRenderer PROVIDED_TARGETS MMRenderer::MMRenderer MODULE_NAME multimedia QMAKE_LIB mmrndclient) qt_find_package(WrapPulseAudio PROVIDED_TARGETS WrapPulseAudio::WrapPulseAudio MODULE_NAME multimedia QMAKE_LIB pulseaudio) qt_find_package(WMF PROVIDED_TARGETS WMF::WMF MODULE_NAME multimedia QMAKE_LIB wmf) -qt_find_package(EGL) +if(TARGET EGL::EGL) + qt_internal_disable_find_package_global_promotion(EGL::EGL) +endif() +qt_find_package(EGL PROVIDED_TARGETS EGL::EGL) + qt_find_package(FFmpeg OPTIONAL_COMPONENTS AVCODEC AVFORMAT AVUTIL SWRESAMPLE SWSCALE PROVIDED_TARGETS FFmpeg::avcodec FFmpeg::avformat FFmpeg::avutil FFmpeg::swresample FFmpeg::swscale MODULE_NAME multimedia QMAKE_LIB ffmpeg) qt_find_package(VAAPI COMPONENTS VA DRM PROVIDED_TARGETS VAAPI::VAAPI MODULE_NAME multimedia QMAKE_LIB vaapi) |