diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-03-29 09:48:44 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2022-03-29 21:12:13 +0000 |
| commit | 9a74d94ff5fa63bfb23dcad1209e2844ef39908b (patch) | |
| tree | bdfe321561856fb9bdf499ba58d2651c101becd2 /coin | |
| parent | 0bdc7322d9232db4a8b6092d032b251ae2e03c7b (diff) | |
Coin: use CMAKE_STAGING_PREFIX for cross-compilations
Re-apply 9a9b253b686618e23c2874cbcb2e5b89e56cd66d to use
CMAKE_STAGING_PREFIX in cross-compilation builds.
Amends b7986a8f6e9df3727f433a0df0ba56a3355153d0.
Fixes: QTBUG-102108
Pick-to: 6.3
Change-Id: I8875da2df1427f02be68dd737168d76a8dc4ed2a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml index 05e687604c..9850f3c60a 100644 --- a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml +++ b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml @@ -76,7 +76,7 @@ instructions: - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS # Use unix separators even on Windows, to avoid escaping issues in the configure script. - variableValue: "{{.Env.TARGET_CMAKE_ARGS}} {{.Env.COMMON_TARGET_CMAKE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{unixPathSeparators .InstallDir}}/target" + variableValue: "{{.Env.TARGET_CMAKE_ARGS}} {{.Env.COMMON_TARGET_CMAKE_ARGS}} -DCMAKE_STAGING_PREFIX:PATH={{unixPathSeparators .InstallDir}}/target" - type: EnvironmentVariable variableName: CONFIGURE_ENV_PREFIX variableValue: "{{.Env.TARGET_ENV_PREFIX}}" |