diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-11 15:13:48 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-11 20:51:17 +0000 |
| commit | f03ac58b1ecc24f01cb83b275a9b6088f9483545 (patch) | |
| tree | bff33cde084ab584d734871d0af34ab1c369297d /coin/module_config.yaml | |
| parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
cmake: add Android build
Task-number: QTBUG-78945
Change-Id: I0c9d3cc7de6d3bfb346a77d95a6bbcad6d707a74
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'coin/module_config.yaml')
| -rw-r--r-- | coin/module_config.yaml | 45 |
1 files changed, 36 insertions, 9 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 75607753cc..8db848012c 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -1,13 +1,40 @@ -version: 1 +version: 2 accept_configuration: condition: property - property: host.os - equals_property: target.os + property: features + not_contains_value: Disable -build_instructions: - - !include "{{qt/qtbase}}/prepare_building_env.yaml" - - !include "{{qt/qtbase}}/cmake_qtbase_build_instructions.yaml" - - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml" +instructions: + Build: + - !include "{{qt/qtbase}}/prepare_building_env.yaml" + - type: Group + instructions: + - !include "{{qt/qtbase}}/cmake_qtbase_build_instructions.yaml" + - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml" + enable_if: + condition: property + property: host.os + equals_property: target.os + - type: Group + instructions: + - !include "{{qt/qtbase}}/cmake_cross_compilation.yaml" + disable_if: + condition: property + property: host.os + equals_property: target.os -test_instructions: - - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml" + Test: + - type: Group + instructions: + - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml" + enable_if: + condition: property + property: host.os + equals_value: target.os + - type: EnvironmentVariable + variableName: Dummy + variableValue: dummy + disable_if: + condition: property + property: host.os + equals_property: target.os |