From dd9760379c83e0a2fe8b76f5a93c7e83aad55a06 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 19 Mar 2020 09:46:39 +0100 Subject: CMake: Enable iOS and Android configs in Coin Change-Id: I5494fca8721de0d1f54670882010a5e22970b80e Reviewed-by: Simon Hausmann --- coin/module_config.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'coin') diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 9f29e1139..7f31a5544 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" -- cgit v1.2.1