1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce FFmpeg-related configure options

Browse Source 
Currently there're two FFmpeg-specific CMake arguments used by
Qt Multimedia to enable building with FFmpeg support:

- FFMPEG_DIR: Specifies the directory path of the FFmpeg development
libraries. The new -ffmpeg-dir configure option maps to this variable.

- QT_DEPLOY_FFMPEG: Determines whether FFmpeg binaries should be copied
to Qt's install directory. The new -ffmpeg-deploy configure option maps
to this variable.

[ChangeLog][configure] `-DFFMPEG_DIR=<dir>` and `-DQT_DEPLOY_FFMPEG=ON`
can now be set via `-ffmpeg-dir <dir>` and `-ffmpeg-deploy` respectively.

Change-Id: Iaff4da99be2682730653178e3b3fef46cfa0bc63
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
This commit is contained in:
Pavel Dubsky 2024-11-22 23:35:47 +01:00
parent 763c47e055
commit 3bed6f4e86
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/QtProcessConfigureArgs.cmake
View File

@ -1049,6 +1049,9 @@ if("${INPUT_ltcg}" STREQUAL "yes")
endforeach()
endif()
translate_path_input(ffmpeg-dir FFMPEG_DIR)
translate_boolean_input(ffmpeg-deploy QT_DEPLOY_FFMPEG)
translate_list_input(device-option QT_QMAKE_DEVICE_OPTIONS)
translate_list_input(defines QT_EXTRA_DEFINES)
translate_list_input(fpaths QT_EXTRA_FRAMEWORKPATHS)

2
cmake/configure-cmake-mapping.md
View File

@ -179,3 +179,5 @@ The following table describes the mapping of configure options to CMake argument
| | | types: gzip, zstd, none. |
| -force-bundled-libs | -DFEATURE_force_bundled_libs=ON | |
| -force-system-libs | -DFEATURE_force_system_libs=ON | |
| -ffmpeg-dir | -DFFMPEG_DIR=<dir> | FFmpeg development libraries directory |
| -ffmpeg-deploy | -DQT_DEPLOY_FFMPEG=ON | FFmpeg binaries will be copied to Qt's install directory |

2
qt_cmdline.cmake
View File

@ -129,6 +129,8 @@ qt_commandline_option(xplatform TYPE string)
qt_commandline_option(zlib CONTROLS_FEATURE TYPE enum NAME system-zlib MAPPING system yes qt no)
qt_commandline_option(zstd TYPE boolean)
qt_commandline_option(coverage TYPE optionalString VALUES gcov)
qt_commandline_option(ffmpeg-dir TYPE string)
qt_commandline_option(ffmpeg-deploy TYPE boolean)
qt_commandline_prefix(D defines)
qt_commandline_prefix(F fpaths)
qt_commandline_prefix(I includes)