summaryrefslogtreecommitdiffstats
path: root/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-12-15 19:15:42 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2022-01-19 01:28:02 +0100
commit6e5c7b9e4fe28308d6ddf8ac7f68814a2bd0382c (patch)
tree540b262f579636461aa7747574e995f38ad68a3f /coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
parente8bf2c6eba6e295ed7ef9807a07b8f2ef8166b19 (diff)
coin: Move AUTOGEN and tests options addition into a common location
As a drive-by this fixes the qtbase build to also have the CMAKE_AUTOGEN_VERBOSE option set. Pick-to: 6.2 6.3 Change-Id: I32324fb1e8e16299c5f34517edbc7ff335d84e14 Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml')
-rw-r--r--coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
index 9ca8d4e672..1cd7430c95 100644
--- a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
+++ b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
@@ -17,7 +17,7 @@ instructions:
- type: ChangeDirectory
directory: "{{.BuildDir}}"
- type: ExecuteCommand
- command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}}/host -DQT_BUILD_TESTS=OFF -DCMAKE_AUTOGEN_VERBOSE=ON {{.SourceDir}}"
+ command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}}/host {{.SourceDir}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 6000
maxTimeBetweenOutput: 1200
@@ -63,7 +63,7 @@ instructions:
property: platformDependency
equals_value: null
- type: ExecuteCommand
- command: "{{.Env.TARGET_ENV_PREFIX}} cmake {{.Env.TARGET_CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}}/target -DQT_BUILD_TESTS=OFF -DCMAKE_AUTOGEN_VERBOSE=ON {{.SourceDir}}"
+ command: "{{.Env.TARGET_ENV_PREFIX}} cmake {{.Env.TARGET_CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}}/target {{.SourceDir}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 6000
maxTimeBetweenOutput: 1200