diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:31:58 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:35:07 +0100 |
| commit | 3af9d49bb78ac56bff57d1c3867853730f97a8e1 (patch) | |
| tree | c9d6c1d1fe90dba3c788fd06795cf05a6d4ed5bb /coin/module_config.yaml | |
| parent | 71436d5499a9e0355f778f47ef465486a727049d (diff) | |
| parent | c431e2d33c2b13dee8b43a08c267c20ec1ae9654 (diff) | |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1
Diffstat (limited to 'coin/module_config.yaml')
| -rw-r--r-- | coin/module_config.yaml | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index ab615583a5..5d50c02afe 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -6,35 +6,7 @@ accept_configuration: 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 + - !include "{{qt/qtbase}}/coin_qtbase_build_template_v2.yaml" Test: - - type: Group - instructions: - - !include "{{qt/qtbase}}/cmake_regular_test_instructions.yaml" - enable_if: - condition: property - property: host.os - equals_property: target.os - - type: EnvironmentVariable - variableName: Dummy - variableValue: dummy - disable_if: - condition: property - property: host.os - equals_property: target.os + - !include "{{qt/qtbase}}/coin_module_test_template_v2.yaml" |