diff options
| author | Pavel Dubsky <pavel.dubsky@qt.io> | 2024-11-22 23:35:47 +0100 |
|---|---|---|
| committer | Pavel Dubsky <pavel.dubsky@qt.io> | 2024-12-03 22:52:45 +0100 |
| commit | 3bed6f4e86e82735a5fee6912ac75c158b51a4ff (patch) | |
| tree | 6013db5559fd0dd6f16bcceaa4c2b939d0a34a8c | |
| parent | 763c47e055376bf6dbd4cd8fe1603b88aa3b72f0 (diff) | |
Introduce FFmpeg-related configure options
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>
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 3 | ||||
| -rw-r--r-- | cmake/configure-cmake-mapping.md | 2 | ||||
| -rw-r--r-- | qt_cmdline.cmake | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 687a3a0bab3..b6736c4044c 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -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) diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index a5a811bb2f0..d861f337130 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -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 | diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index d2545c912eb..f85a8e6a66f 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -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) |