aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2022-06-30 11:28:50 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-07-15 06:32:30 +0000
commit072181ed4416fb36cee95ad530d27b56f9e71b53 (patch)
treead2ca3750a6e805691e2b2ace9f9a3327e8560ea
parentdc320860843ce496fdc7f298d86c70462a85a2a7 (diff)
QNX: generate wrapper scripts for all hosts
The QNX build done on linux host can be used in installer for all host, make sure that the wrapper scripts are also available for all hosts. Change-Id: I564b66682cdfd514e165dfb1542683e9a542a53d Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io> (cherry picked from commit 4ec187cd4cbb297ac309e913412b4988196e9196) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/platform_configs/cmake_platforms_qemu_qnx710.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
index 291b621e..0bd9ce14 100644
--- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
@@ -11,7 +11,7 @@ Configurations:
Features: ['Packaging', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
- 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
+ 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
'QT_CMAKE_DIR=/opt/cmake-3.21.3/bin',
'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
]
@@ -25,7 +25,7 @@ Configurations:
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
- 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
+ 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
]
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -37,5 +37,5 @@ Configurations:
Features: ['Packaging', 'DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
- 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
+ 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
]