From bf2b855daf81ebe007505c4adfe99165f6f97b8a Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Fri, 24 Nov 2023 13:48:15 +0200 Subject: Make vxworks target significant on all ported modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.7 Change-Id: Ic9e6f0d5eddcfd242b935cc2d473df611cc32835 Reviewed-by: Simo Fält Reviewed-by: Tero Heikkinen --- coin/platform_configs/cmake_platforms.yaml | 1 - coin/platform_configs/cmake_platforms_qemu_vxworks.yaml | 2 +- coin/platform_configs/qtbase.yaml | 3 ++- coin/platform_configs/qtdeclarative.yaml | 3 ++- coin/platform_configs/qtgraphs.yaml | 3 ++- coin/platform_configs/qtgrpc.yaml | 5 ++++- coin/platform_configs/qtimageformats.yaml | 3 ++- coin/platform_configs/qtlanguageserver.yaml | 3 ++- coin/platform_configs/qtmultimedia.yaml | 3 ++- coin/platform_configs/qtquick3d.yaml | 3 ++- coin/platform_configs/qtquicktimeline.yaml | 3 ++- coin/platform_configs/qtshadertools.yaml | 3 ++- coin/platform_configs/qtsvg.yaml | 3 ++- coin/platform_configs/qtvirtualkeyboard.yaml | 3 ++- 14 files changed, 27 insertions(+), 14 deletions(-) (limited to 'coin') diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 13103eef..2c5e5d55 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -2,7 +2,6 @@ Version: 2 Include: [ cmake_platforms_qemu.yaml, cmake_platforms_qemu_qnx710.yaml, - cmake_platforms_qemu_vxworks.yaml, cmake_platforms_target_android.yaml, cmake_platforms_wasm.yaml, macos.yaml diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks.yaml index db3177d1..ddc033ad 100644 --- a/coin/platform_configs/cmake_platforms_qemu_vxworks.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_vxworks.yaml @@ -8,7 +8,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'ubuntu-22.04' - Features: ['Packaging', 'VMSize8', 'UseConfigure', 'Insignificant', 'DisableTests'] + Features: ['Packaging', 'VMSize8', 'UseConfigure', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -developer-build -force-debug-info -qpa eglfs -nomake examples', 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index e1c3b672..78e55287 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -6,6 +6,7 @@ Include: [ ios-tests.yaml, address_sanitizer_platforms.yaml, linux_android_tests_multi_abi.yaml, - wasm_qtbase_tests.yaml + wasm_qtbase_tests.yaml, + cmake_platforms_qemu_vxworks.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 89bed6b6..bfcf833b 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -4,6 +4,7 @@ Include: [ integrity.yaml, ios-tests.yaml, address_sanitizer_platforms.yaml, - cmake_platforms_static_tests.yaml + cmake_platforms_static_tests.yaml, + cmake_platforms_qemu_vxworks.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtgraphs.yaml b/coin/platform_configs/qtgraphs.yaml index 8e519caa..34624412 100644 --- a/coin/platform_configs/qtgraphs.yaml +++ b/coin/platform_configs/qtgraphs.yaml @@ -1,5 +1,6 @@ Version: 2 Include: [ - cmake_platforms.yaml + cmake_platforms.yaml, + cmake_platforms_qemu_vxworks.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtgrpc.yaml b/coin/platform_configs/qtgrpc.yaml index c3233842..9a4d5456 100644 --- a/coin/platform_configs/qtgrpc.yaml +++ b/coin/platform_configs/qtgrpc.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_qemu_vxworks.yaml +] Configurations: [] diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml index 6d378d5e..c2aada96 100644 --- a/coin/platform_configs/qtimageformats.yaml +++ b/coin/platform_configs/qtimageformats.yaml @@ -2,6 +2,7 @@ Version: 2 Include: [ cmake_platforms.yaml, address_sanitizer_platforms.yaml, - integrity.yaml + integrity.yaml, + cmake_platforms_qemu_vxworks.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtlanguageserver.yaml b/coin/platform_configs/qtlanguageserver.yaml index 6d378d5e..c2aada96 100644 --- a/coin/platform_configs/qtlanguageserver.yaml +++ b/coin/platform_configs/qtlanguageserver.yaml @@ -2,6 +2,7 @@ Version: 2 Include: [ cmake_platforms.yaml, address_sanitizer_platforms.yaml, - integrity.yaml + integrity.yaml, + cmake_platforms_qemu_vxworks.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtmultimedia.yaml b/coin/platform_configs/qtmultimedia.yaml index 8e519caa..34624412 100644 --- a/coin/platform_configs/qtmultimedia.yaml +++ b/coin/platform_configs/qtmultimedia.yaml @@ -1,5 +1,6 @@ Version: 2 Include: [ - cmake_platforms.yaml + cmake_platforms.yaml, + cmake_platforms_qemu_vxworks.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml index 82ab0218..e343bd55 100644 --- a/coin/platform_configs/qtquick3d.yaml +++ b/coin/platform_configs/qtquick3d.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml + integrity.yaml, + cmake_platforms_qemu_vxworks.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtquicktimeline.yaml b/coin/platform_configs/qtquicktimeline.yaml index 8e519caa..34624412 100644 --- a/coin/platform_configs/qtquicktimeline.yaml +++ b/coin/platform_configs/qtquicktimeline.yaml @@ -1,5 +1,6 @@ Version: 2 Include: [ - cmake_platforms.yaml + cmake_platforms.yaml, + cmake_platforms_qemu_vxworks.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtshadertools.yaml b/coin/platform_configs/qtshadertools.yaml index 6d378d5e..c2aada96 100644 --- a/coin/platform_configs/qtshadertools.yaml +++ b/coin/platform_configs/qtshadertools.yaml @@ -2,6 +2,7 @@ Version: 2 Include: [ cmake_platforms.yaml, address_sanitizer_platforms.yaml, - integrity.yaml + integrity.yaml, + cmake_platforms_qemu_vxworks.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index 6d378d5e..c2aada96 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -2,6 +2,7 @@ Version: 2 Include: [ cmake_platforms.yaml, address_sanitizer_platforms.yaml, - integrity.yaml + integrity.yaml, + cmake_platforms_qemu_vxworks.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtvirtualkeyboard.yaml b/coin/platform_configs/qtvirtualkeyboard.yaml index 8e519caa..34624412 100644 --- a/coin/platform_configs/qtvirtualkeyboard.yaml +++ b/coin/platform_configs/qtvirtualkeyboard.yaml @@ -1,5 +1,6 @@ Version: 2 Include: [ - cmake_platforms.yaml + cmake_platforms.yaml, + cmake_platforms_qemu_vxworks.yaml ] Configurations: [] -- cgit v1.2.3