1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cross compilation builds with template v2

Browse Source 
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>
This commit is contained in:
Alexandru Croitor 2020-02-07 13:29:49 +01:00
parent d445112cc0
commit abc2e51041
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
coin/instructions/call_host_cmake.yaml
View File

@ -13,6 +13,7 @@ instructions:
equals_value: Windows equals_value: Windows
- type: ExecuteCommand - type: ExecuteCommand
command: "{{.InstallDir}}/host/bin/qt-cmake {{.Env.COIN_CMAKE_ARGS}}" command: "{{.InstallDir}}/host/bin/qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 6000 maxTimeInSeconds: 6000
maxTimeBetweenOutput: 1200 maxTimeBetweenOutput: 1200
userMessageOnFailure: > userMessageOnFailure: >

1
coin/instructions/call_target_cmake.yaml
View File

@ -13,6 +13,7 @@ instructions:
equals_value: Windows equals_value: Windows
- type: ExecuteCommand - type: ExecuteCommand
command: "{{.InstallDir}}/target/bin/qt-cmake {{.Env.COIN_CMAKE_ARGS}}" command: "{{.InstallDir}}/target/bin/qt-cmake {{.Env.COIN_CMAKE_ARGS}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 6000 maxTimeInSeconds: 6000
maxTimeBetweenOutput: 1200 maxTimeBetweenOutput: 1200
userMessageOnFailure: > userMessageOnFailure: >