From 26e09279f3cd12324657011c640972e297928f53 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Mon, 3 May 2021 16:42:46 +0200 Subject: cmake: Nearly full cmake build Had to rename a lot of things to conform with the standard Qt module layout that the cmake system expects: - all non-manual tests were moved to a sub-dir named auto/ - the benchmark was moved to tests/ - the 3rdparty folder was moved into src/ Other changes: - libyaml was updated to 2.2.5 while fixing a weird build issue that led to crashes on 64bit systems. - fixed build issues with the new 8.1 MingW compiler. - added support for QT_NO_OPENGL builds. The remaining issues are: - examples still don't build with qmake due to a potential bug in module.pri generation. - tests do run, but the test data is not generated yet dynamically. - qml-only tests are not built and run yet. - qml-only examples are not built yet. Fixes: AUTOSUITE-1632 Change-Id: Ic5fe0148e738b05835c73bed78e624b55861b75e Reviewed-by: Qt CI Bot Reviewed-by: Dominik Holland --- coin/module_config.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 coin/module_config.yaml (limited to 'coin') diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 00000000..47a5f070 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,23 @@ +version: 2 +accept_configuration: + condition: property + property: features + not_contains_value: Disable + +instructions: + Build: + - !include "{{qt/qtbase}}/coin_module_build_template_v2.yaml" + + Test: + - type: Group + instructions: + - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml" + disable_if: + condition: or + conditions: + - condition: property + property: host.os + in_values: ["Windows", "MacOS"] + - condition: property + property: target.os + in_values: ["IOS", "Android", "WebAssembly"] -- cgit v1.2.1