CMake: Allow building and running tests targeting iOS in other repos
Allow building iOS tests in other repos, if DisableTests is not specified. The reordering in coin_module_build_template_v2.yaml is done to match the same order that's in coin_qtbase_build_template_v2.yaml. The change in coin_module_test_template_v3.yaml is just cosmetic. Amends 80705298ca11587782beed49c4ae55f533cfc0c2 Task-number: QTBUG-96056 Change-Id: Ic69ef938cb9319fa9a0eb063046b009de34bebc1 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 74d6ca276830969b151e168d0fd8a26ac4ec361c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
37045f8efc
commit
e6ee26fe07
@ -33,7 +33,7 @@ instructions:
|
||||
enable_if:
|
||||
condition: property
|
||||
property: target.osVersion
|
||||
in_values: [Android_ANY, QEMU, INTEGRITY, QNX_710]
|
||||
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, INTEGRITY]
|
||||
enable_if:
|
||||
condition: or
|
||||
conditions:
|
||||
|
@ -14,10 +14,7 @@ instructions:
|
||||
equals_property: target.os
|
||||
- condition: property
|
||||
property: target.osVersion
|
||||
in_values: [QEMU, QNX_710]
|
||||
- condition: property
|
||||
property: target.osVersion
|
||||
equals_value: IOS_ANY
|
||||
in_values: [QEMU, QNX_710, IOS_ANY]
|
||||
- condition: property
|
||||
property: features
|
||||
contains_value: AndroidTestRun
|
||||
|
Loading…
x
Reference in New Issue
Block a user