diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-13 20:54:08 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-15 12:43:42 +0100 |
| commit | 42cd696f8da13ce038b1572e7caaf77c60f3095f (patch) | |
| tree | 451ba3d17225eebc726096352c8589c4b3bba086 /coin | |
| parent | 814e87ce4bdd6c0f217866f3f4888f3ecffb9825 (diff) | |
CMake: Enable cross-building Coin configurations
This will enable iOS and Android CMake builds in Coin.
Change-Id: Id2fea5b48de74185e19410ee5a61333c6f296d9e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/module_config.yaml | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 9f29e1139b..7f31a5544f 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -1,13 +1,12 @@ -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_module_build_instructions.yaml" - - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml" +instructions: + Build: + - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" -test_instructions: - - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml" + Test: + - !include "{{qt/qtbase}}/coin_module_test_template_v2.yaml" |