From abc2e51041964f3decc2bf9c63b600d81552e23c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 7 Feb 2020 13:29:49 +0100 Subject: [PATCH] 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 Reviewed-by: Alexandru Croitor --- coin/instructions/call_host_cmake.yaml | 1 + coin/instructions/call_target_cmake.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/coin/instructions/call_host_cmake.yaml b/coin/instructions/call_host_cmake.yaml index f626214f2b6..0dfcec5c750 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 475cbf6d382..2c0102511ff 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: >