diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-07 13:29:49 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-07 12:37:10 +0000 |
commit | abc2e51041964f3decc2bf9c63b600d81552e23c (patch) | |
tree | 6cde3bb71a6903a68e5ef51328d7bef61f87461e /coin/instructions | |
parent | d445112cc03d730d659d1eeaa84d963f85731ac5 (diff) |
Fix cross compilation builds with template v2
Make sure to split the command arguments after variable substitution
like it is done in call_cmake.yaml.
Amends d445112cc03d730d659d1eeaa84d963f85731ac5
Change-Id: Id23fcfa5b58c33e05495413fb10349fbcff1bfac
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin/instructions')
-rw-r--r-- | coin/instructions/call_host_cmake.yaml | 1 | ||||
-rw-r--r-- | coin/instructions/call_target_cmake.yaml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/coin/instructions/call_host_cmake.yaml b/coin/instructions/call_host_cmake.yaml index f626214f2b..0dfcec5c75 100644 --- a/coin/instructions/call_host_cmake.yaml +++ b/coin/instructions/call_host_cmake.yaml @@ -13,6 +13,7 @@ instructions: equals_value: Windows - type: ExecuteCommand command: "{{.InstallDir}}/host/bin/qt-cmake {{.Env.COIN_CMAKE_ARGS}}" + executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > diff --git a/coin/instructions/call_target_cmake.yaml b/coin/instructions/call_target_cmake.yaml index 475cbf6d38..2c0102511f 100644 --- a/coin/instructions/call_target_cmake.yaml +++ b/coin/instructions/call_target_cmake.yaml @@ -13,6 +13,7 @@ instructions: equals_value: Windows - type: ExecuteCommand command: "{{.InstallDir}}/target/bin/qt-cmake {{.Env.COIN_CMAKE_ARGS}}" + executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > |