diff options
| author | Artem Dyomin <artem.dyomin@qt.io> | 2023-01-20 14:58:01 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-25 09:28:53 +0000 |
| commit | 397f2dadd43d212d748002b8e2c53a5e5a9666b3 (patch) | |
| tree | 6db85cca5e8d009dde436d5ae4411f26fa50bf30 /coin/platform_configs | |
| parent | 394f69b2cd5067b406656a57bc09baf3e887653b (diff) | |
Fix missing ffmpeg for desktop Linux CI platforms
What's done:
- ffmpeg build added to OpenSuse platforms
- installing of yasm moved to packages install file in
order to get rid of OS checkings
Change-Id: I256f19a03e7f01d27923b083b63d9a6b6a5f29b4
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
(cherry picked from commit e5cf7b2d584560f70ba143aac6a40ba80aea7bb6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/address_sanitizer_platforms.yaml | 3 | ||||
| -rw-r--r-- | coin/platform_configs/cmake_platforms.yaml | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/coin/platform_configs/address_sanitizer_platforms.yaml b/coin/platform_configs/address_sanitizer_platforms.yaml index ca10223d..6f6ac075 100644 --- a/coin/platform_configs/address_sanitizer_platforms.yaml +++ b/coin/platform_configs/address_sanitizer_platforms.yaml @@ -9,5 +9,6 @@ Configurations: Environment variables: [ 'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}', 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer', - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index ee42b4de..eed7b64d 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -33,7 +33,8 @@ Configurations: Environment variables: [ 'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}', 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer', - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] - Id: 'sles-15_sp4-static' @@ -42,7 +43,8 @@ Configurations: Features: ['Sccache', 'DisableTests', 'UseConfigure'] Configure arguments: '-nomake examples -static -no-sql-mysql' Environment variables: [ - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] - Id: 'windows-10_22h2-msvc2019' |