summaryrefslogtreecommitdiff
path: root/coin
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-04-01 16:44:10 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-04-01 16:48:10 +0200
commit3d4160fc36d584183b473fbffdb528b50a839b98 (patch)
tree957d3fbf70d550480ea50a75a6469de973196a24 /coin
parent78c0e10c2f67d837928dafebf8a977fbc50834ac (diff)
parent5fad16ac553dd6e80939a64db6ab655e55292aeb (diff)
downloadqtwayland-3d4160fc36d584183b473fbffdb528b50a839b98.tar.gz
Merge remote-tracking branch 'origin/wip/cmake' into dev
Adjusted xcomposite-glx to link against X11. Added latest Coin instructions, plus some additional logic to skip some platforms where building wayland does not make sense. Otherwise Coin will fail on those platforms when trying to extract artifacts that don't exist. Conflicts: coin/module_config.yaml src/hardwareintegration/compositor/xcomposite-glx/xcomposite-glx.pri src/plugins/hardwareintegration/compositor/xcomposite-glx/CMakeLists.txt Change-Id: I2383b0826ece841f3862f396516f402390aa42be
Diffstat (limited to 'coin')
-rw-r--r--coin/module_config.yaml27
1 files changed, 27 insertions, 0 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
new file mode 100644
index 00000000..8cbc8705
--- /dev/null
+++ b/coin/module_config.yaml
@@ -0,0 +1,27 @@
+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_v2.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"]
+ - type: EnvironmentVariable
+ variableName: Dummy
+ variableValue: dummy
+