From 6e5c7b9e4fe28308d6ddf8ac7f68814a2bd0382c Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 15 Dec 2021 19:15:42 +0100 Subject: 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 --- .../cmake_build_and_upload_test_artifacts.yaml | 4 ++-- ...ross_compilation_module_build_instructions.yaml | 4 ++-- ...ross_compilation_qtbase_build_instructions.yaml | 4 ++-- .../cmake_module_build_instructions.yaml | 2 +- .../cmake_qtbase_build_instructions.yaml | 2 +- coin/instructions/prepare_building_env.yaml | 22 ++++++++++++++++++++++ 6 files changed, 30 insertions(+), 8 deletions(-) (limited to 'coin/instructions') diff --git a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml index e4cb9bfb19..9e94dd3d27 100644 --- a/coin/instructions/cmake_build_and_upload_test_artifacts.yaml +++ b/coin/instructions/cmake_build_and_upload_test_artifacts.yaml @@ -10,14 +10,14 @@ instructions: directory: "{{.BuildDir}}" - type: AppendToEnvironmentVariable variableName: COIN_CMAKE_ARGS - variableValue: " -DCMAKE_AUTOGEN_VERBOSE=ON -S {{.SourceDir}} -B ." + variableValue: " -S {{.SourceDir}} -B ." disable_if: condition: runtime env_var: COIN_CMAKE_ARGS equals_value: null - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS - variableValue: "-DCMAKE_AUTOGEN_VERBOSE=ON -S {{.SourceDir}} -B ." + variableValue: "-S {{.SourceDir}} -B ." enable_if: condition: runtime env_var: COIN_CMAKE_ARGS 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" 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 diff --git a/coin/instructions/cmake_module_build_instructions.yaml b/coin/instructions/cmake_module_build_instructions.yaml index b53e6a8375..8446ad6fbe 100644 --- a/coin/instructions/cmake_module_build_instructions.yaml +++ b/coin/instructions/cmake_module_build_instructions.yaml @@ -9,7 +9,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_cmake.yaml" - type: EnvironmentVariable variableName: CMAKE_BUILD_TIMEOUT diff --git a/coin/instructions/cmake_qtbase_build_instructions.yaml b/coin/instructions/cmake_qtbase_build_instructions.yaml index b7ba32daff..f352df1fcd 100644 --- a/coin/instructions/cmake_qtbase_build_instructions.yaml +++ b/coin/instructions/cmake_qtbase_build_instructions.yaml @@ -7,7 +7,7 @@ instructions: - type: ChangeDirectory directory: "{{.BuildDir}}" - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DQT_BUILD_TESTS=OFF {{.SourceDir}}" + command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} {{.SourceDir}}" executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution maxTimeInSeconds: 6000 maxTimeBetweenOutput: 1200 diff --git a/coin/instructions/prepare_building_env.yaml b/coin/instructions/prepare_building_env.yaml index 167cf81a72..6c52381f4e 100644 --- a/coin/instructions/prepare_building_env.yaml +++ b/coin/instructions/prepare_building_env.yaml @@ -358,6 +358,28 @@ instructions: property: features contains_value: WarningsAreErrors + - type: Group + instructions: + - type: AppendToEnvironmentVariable + variableName: CONFIGURE_ARGS + variableValue: " -DQT_BUILD_TESTS=OFF -DCMAKE_AUTOGEN_VERBOSE=ON" + - type: AppendToEnvironmentVariable + variableName: NON_QTBASE_CONFIGURE_ARGS + variableValue: " -DQT_BUILD_TESTS=OFF -DCMAKE_AUTOGEN_VERBOSE=ON" + - type: AppendToEnvironmentVariable + variableName: TEST_CONFIGURE_ARGS + variableValue: " -DCMAKE_AUTOGEN_VERBOSE=ON" + + - type: AppendToEnvironmentVariable + variableName: TARGET_CONFIGURE_ARGS + variableValue: " -DQT_BUILD_TESTS=OFF -DCMAKE_AUTOGEN_VERBOSE=ON" + - type: AppendToEnvironmentVariable + variableName: NON_QTBASE_TARGET_CONFIGURE_ARGS + variableValue: " -DQT_BUILD_TESTS=OFF -DCMAKE_AUTOGEN_VERBOSE=ON" + - type: AppendToEnvironmentVariable + variableName: TARGET_TEST_CONFIGURE_ARGS + variableValue: " -DCMAKE_AUTOGEN_VERBOSE=ON" + # Sccache - type: Group instructions: -- cgit v1.2.3