diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-12-15 19:15:42 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-01-19 01:28:02 +0100 |
| commit | 6e5c7b9e4fe28308d6ddf8ac7f68814a2bd0382c (patch) | |
| tree | 540b262f579636461aa7747574e995f38ad68a3f /coin/instructions/cmake_cross_compilation_module_build_instructions.yaml | |
| parent | e8bf2c6eba6e295ed7ef9807a07b8f2ef8166b19 (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_module_build_instructions.yaml')
| -rw-r--r-- | coin/instructions/cmake_cross_compilation_module_build_instructions.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml index 8df1720be6..7601cdd4df 100644 --- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml +++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml @@ -33,7 +33,7 @@ instructions: - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS # The lack of space between the non qtbase configure args and the rest of the args is important! - variableValue: "{{.Env.NON_QTBASE_CONFIGURE_ARGS}} -DQT_BUILD_TESTS=OFF -DCMAKE_AUTOGEN_VERBOSE=ON {{.SourceDir}}" + variableValue: "{{.Env.NON_QTBASE_CONFIGURE_ARGS}} {{.SourceDir}}" - !include "{{qt/qtbase}}/call_host_cmake.yaml" - type: ExecuteCommand command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" @@ -63,7 +63,7 @@ instructions: - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS # The lack of space between the non qtbase configure args and the rest of the args is important! - variableValue: "{{.Env.NON_QTBASE_TARGET_CONFIGURE_ARGS}} -DQT_BUILD_TESTS=OFF -DCMAKE_AUTOGEN_VERBOSE=ON {{.SourceDir}}" + variableValue: "{{.Env.NON_QTBASE_TARGET_CONFIGURE_ARGS}} {{.SourceDir}}" - !include "{{qt/qtbase}}/call_target_cmake.yaml" - type: ExecuteCommand command: "{{.Env.TARGET_ENV_PREFIX}} cmake --build . --parallel -v" |