diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-12 12:07:13 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-12 12:49:52 +0200 |
| commit | 040798729644237e5bb47e346a66b68a86ea445b (patch) | |
| tree | 4969c5ebc89dbfcde5abe03866916121a6d007d9 /coin | |
| parent | b184a388008df78a041935f21b433c87d514e076 (diff) | |
CMake: Update Coin instructions for CMake builds
Change-Id: Ib70948e6ade9d95188134a25f35c816708da5484
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
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 9f29e11..7f31a55 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" |