aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
authorPiotr Srebrny <piotr.srebrny@qt.io>2022-06-24 17:32:30 +0200
committerSimo Fält <simo.falt@qt.io>2022-11-02 16:52:29 +0200
commit221750003129e16ae349f322b47ec265068673db (patch)
tree5d313524abe580d7157f3d1b655daec1d6ce5a8d /coin/platform_configs
parentd7984542a21d0b66941be5c4735c4eb4f96a2a7b (diff)
Build static FFmpeg library on macOS
This patch modifies linux/ffmpeg-install.sh to work also for macOS. The FFmpeg libraries are installed under /usr/local both for Linux and macOS. Since macOS x64 does not have the lzma lib for arm64 architecture installed by default, I disable this libraries for FFmpeg. This only affects the TIFF image decoder that we do not use. Added the execute permission to the ubuntu scripts. Change-Id: Ib8623c6a9bcdd24c89045ede0494839fb9cd2ecc Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 51c663d171ce261e01d98e7c019460f6db0d220f) Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/macos.yaml5
1 files changed, 3 insertions, 2 deletions
diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml
index 49e0ce12..112d0c82 100644
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -16,7 +16,7 @@ Configurations:
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
- 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF',
+ 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
]
@@ -95,7 +95,8 @@ Configurations:
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
Environment variables: [
- 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
+ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
+ 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
]
-
Id: 'macos-latest-xcode-arm64-developer-build'