diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-03-09 17:13:23 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2022-03-17 17:27:39 +0100 |
| commit | 8d083c6f944baa068e110f4422a278bcfff6b79d (patch) | |
| tree | 9ab2c7e4e29b4b9303ddd4636320f85a06c64872 /coin | |
| parent | 6a97aba9789222648ebcb44cfad4c3444d43ee7b (diff) | |
| download | qtactiveqt-8d083c6f944baa068e110f4422a278bcfff6b79d.tar.gz | |
coin: Prepare for using qt-configure-module in instructions
When using qt-configure-module, CMake args need to be added to
NON_QTBASE_CMAKE_ARGS and NON_QTBASE_TARGET_CMAKE_ARGS instead of
and NON_QTBASE_TARGET_CONFIGURE_ARGS.
Pick-to: 6.2 6.3
Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: Iec46883bccd62beec3dc9061f384d7959000ef8e
Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/module_config.yaml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 3326a5f..fa0affc 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -19,9 +19,31 @@ instructions: - type: AppendToEnvironmentVariable variableName: NON_QTBASE_CONFIGURE_ARGS variableValue: " -DQT_NO_AX_SERVER_REGISTRATION=ON" + disable_if: + condition: property + property: features + contains_value: UseConfigure - type: AppendToEnvironmentVariable variableName: NON_QTBASE_TARGET_CONFIGURE_ARGS variableValue: " -DQT_NO_AX_SERVER_REGISTRATION=ON" + disable_if: + condition: property + property: features + contains_value: UseConfigure + - type: AppendToEnvironmentVariable + variableName: NON_QTBASE_CMAKE_ARGS + variableValue: " -DQT_NO_AX_SERVER_REGISTRATION=ON" + enable_if: + condition: property + property: features + contains_value: UseConfigure + - type: AppendToEnvironmentVariable + variableName: NON_QTBASE_TARGET_CMAKE_ARGS + variableValue: " -DQT_NO_AX_SERVER_REGISTRATION=ON" + enable_if: + condition: property + property: features + contains_value: UseConfigure - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" Test: |