diff options
| author | Artem Dyomin <artem.dyomin@qt.io> | 2023-08-04 15:49:53 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-08-07 16:28:33 +0000 |
| commit | eb57d3fecfb0ee2c0755c00a4af9cd22244e0b93 (patch) | |
| tree | 49c611b6bdea378e9bace35f7a27bf498e8394b8 | |
| parent | 51a6631f485b19d1f3b44abc9ebce16157238ae5 (diff) | |
Fix build of qtinterfaceframework
The error is:
The link interface of target "Qt6::QFFmpegMediaPlugin" contains:
VAAPI::VAAPI
but the target was not found.
Task-number: QTBUG-115763
Change-Id: Ie1cbacdc719d51d88fb08b251c0315487b1ce563
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 1c811b5918daa908f725cdae4933b0aca347eb42)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimedia/configure.cmake | 2 | ||||
| -rw-r--r-- | src/plugins/multimedia/ffmpeg/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake index 7fdb0af3a..609806507 100644 --- a/src/multimedia/configure.cmake +++ b/src/multimedia/configure.cmake @@ -25,7 +25,7 @@ qt_find_package(WMF PROVIDED_TARGETS WMF::WMF MODULE_NAME multimedia QMAKE_LIB w qt_find_package(EGL) qt_find_package(FFmpeg OPTIONAL_COMPONENTS AVCODEC AVFORMAT AVUTIL AVDEVICE SWRESAMPLE SWSCALE PROVIDED_TARGETS FFmpeg::avcodec FFmpeg::avformat FFmpeg::avutil FFmpeg::avdevice FFmpeg::swresample FFmpeg::swscale MODULE_NAME multimedia QMAKE_LIB ffmpeg) -qt_find_package(VAAPI COMPONENTS VA DRM PROVIDED_TARGETS VAAPI::VA VAAPI::DRM MODULE_NAME multimedia QMAKE_LIB vaapi) +qt_find_package(VAAPI COMPONENTS VA DRM PROVIDED_TARGETS VAAPI::VAAPI MODULE_NAME multimedia QMAKE_LIB vaapi) #### Tests diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt index 219e0abf4..56b8c60f4 100644 --- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt +++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause qt_find_package(EGL) -qt_find_package(VAAPI COMPONENTS VA DRM PROVIDED_TARGETS VAAPI::VA VAAPI::DRM MODULE_NAME multimedia QMAKE_LIB vaapi) +qt_find_package(VAAPI COMPONENTS VA DRM PROVIDED_TARGETS VAAPI::VAAPI MODULE_NAME multimedia QMAKE_LIB vaapi) qt_internal_find_apple_system_framework(FWCoreMedia CoreMedia) qt_internal_find_apple_system_framework(FWCoreAudio CoreAudio) |