diff options
| author | Dominik Holland <dominik.holland@qt.io> | 2022-06-09 14:15:14 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@qt.io> | 2022-06-10 14:01:44 +0000 |
| commit | e17ec791b090746fe776908059f9e1b9ec6916f5 (patch) | |
| tree | 968b4b82365ba819a2af53b467b437d8870bfd36 | |
| parent | 3e48954b076ff6f91ac64a951dab1b277de62292 (diff) | |
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: dev 6.2 6.3
Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: I5c16a6acfdd6afeea98c0058c1750ac9b018e596
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| -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 5667ae3c..cb005561 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -12,9 +12,31 @@ instructions: - type: AppendToEnvironmentVariable variableName: NON_QTBASE_CONFIGURE_ARGS variableValue: " -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}}" + disable_if: + condition: property + property: features + contains_value: UseConfigure - type: AppendToEnvironmentVariable variableName: NON_QTBASE_TARGET_CONFIGURE_ARGS variableValue: " -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}}" + disable_if: + condition: property + property: features + contains_value: UseConfigure + - type: AppendToEnvironmentVariable + variableName: NON_QTBASE_CMAKE_ARGS + variableValue: " -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}}" + enable_if: + condition: property + property: features + contains_value: UseConfigure + - type: AppendToEnvironmentVariable + variableName: NON_QTBASE_TARGET_CMAKE_ARGS + variableValue: " -DPython3_ROOT_DIR={{.Env.PYTHON3_PATH}}" + enable_if: + condition: property + property: features + contains_value: UseConfigure - type: Group instructions: - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" |