diff options
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/axivion/ci_config_linux.json | 44 | ||||
| -rw-r--r-- | coin/module_config.yaml | 7 | ||||
| -rw-r--r-- | coin/qt-installer-package-config.json | 3 |
3 files changed, 48 insertions, 6 deletions
diff --git a/coin/axivion/ci_config_linux.json b/coin/axivion/ci_config_linux.json new file mode 100644 index 000000000..d58bf1fff --- /dev/null +++ b/coin/axivion/ci_config_linux.json @@ -0,0 +1,44 @@ +{ + "Project": { + "BuildSystemIntegration": { + "child_order": [ + "GCCSetup", + "CMake", + "LinkLibraries" + ] + }, + "CMake": { + "_active": true, + "_copy_from": "CMakeIntegration", + "build_environment": {}, + "build_options": "-j4", + "generate_options": "--fresh", + "generator": "Ninja" + }, + "GCCSetup": { + "_active": true, + "_copy_from": "Command", + "build_command": "gccsetup --cc gcc --cxx g++ --config ../../../axivion/" + }, + "LinkLibraries": { + "_active": true, + "_copy_from": "AxivionLinker", + "input_files": [ + "build/lib/lib*.so*.ir", + "build/qml/*/*/*/lib*.so*.ir" + ], + "ir": "build/$(env:TESTED_MODULE_COIN).ir", + "plugin_files": [ + "build/plugins/*/lib*.so*.ir" + ] + } + }, + "_Format": "1.0", + "_Version": "7.6.2", + "_VersionNum": [ + 7, + 6, + 2, + 12725 + ] +} diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 3e8b83c53..6ec20569e 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -12,6 +12,7 @@ instructions: - type: Group instructions: - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml" + - !include "{{qt/qtbase}}/coin_module_test_docs.yaml" disable_if: condition: or conditions: @@ -20,8 +21,4 @@ instructions: in_values: ["Windows", "MacOS"] - condition: property property: target.os - in_values: ["IOS", "Android", "WebAssembly"] - - type: EnvironmentVariable - variableName: Dummy - variableValue: dummy - + in_values: ["QNX", "IOS", "Android", "WebAssembly"] diff --git a/coin/qt-installer-package-config.json b/coin/qt-installer-package-config.json index 2737a1947..89beb4b43 100644 --- a/coin/qt-installer-package-config.json +++ b/coin/qt-installer-package-config.json @@ -6,7 +6,8 @@ "**/*Compositor*/**/*", "**/*Compositor*", "**/wayland-graphics-integration-server/*", - "**/wayland-hardware-layer-integration/*" + "**/wayland-hardware-layer-integration/*", + "**/QmlPlugins/Qt6WaylandTextureSharing*.cmake" ] } } |