diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-03-29 09:48:44 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-29 21:12:23 +0000 |
| commit | db95af2df63916eb558a23b892ccfc986f0562c2 (patch) | |
| tree | 81661c76446f2aad75677a8590a61b09e6332ef8 /coin | |
| parent | dafb4325de2e1f558e8a3999df978ee44c9775f0 (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
Change-Id: I8875da2df1427f02be68dd737168d76a8dc4ed2a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9a74d94ff5fa63bfb23dcad1209e2844ef39908b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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}}" |