qiurui
/
qtactiveqt
mirror of https://github.com/qt/qtactiveqt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alexandru Croitor 2022-03-09 17:13:23 +01:00
parent 6a97aba978
commit 8d083c6f94
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
coin/module_config.yaml
View File

@ -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: