lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

QNX: Add CMAKE_SYSTEM_PROCESSOR definition for QNX toolchain files

Browse Source 
Add CMAKE_SYSTEM PROCESSOR definition and use that for finding processor specific binaries from QNX SDP.

Task-number: QTBUG-116082
Pick-to: 6.5
Change-Id: I893cac45058d8e0ac6228159e9b97bc59307ff35
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b5607a5894)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marianne Yrjänä
2023-10-04 16:42:32 +03:00
committed by Qt Cherry-pick Bot
parent 8960724cd4
commit 73cb2e83e4
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coin/platform_configs/nightly_qnx710_host_windows.yaml
View File

@@ -16,6 +16,6 @@ Configurations:
Features: ['DisableTests', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_LIBRARY_PATH={{.Env.QNX_710}}\target\qnx7\aarch64le\lib;{{.Env.QNX_710}}\target\qnx7\aarch64le\usr\lib -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON'
]

3
coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake
View File

@@ -1,4 +1,5 @@
set(CMAKE_SYSTEM_NAME QNX)
set(CMAKE_SYSTEM_PROCESSOR aarch64le)
if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
@@ -13,7 +14,7 @@ if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
endif()
set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/)
set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET};$ENV{QNX_TARGET}/${CMAKE_SYSTEM_PROCESSOR})
set(_qnx_toolchain_arch gcc_ntoaarch64le)

3
coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake
View File

@@ -1,4 +1,5 @@
set(CMAKE_SYSTEM_NAME QNX)
set(CMALE_SYSTEM_PROCESSOR armv7le)
if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
@@ -13,7 +14,7 @@ if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
endif()
set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/)
set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET};$ENV{QNX_TARGET}/${CMAKE_SYSTEM_PROCESSOR})
set(_qnx_toolchain_arch gcc_ntoarmv7le)

3
coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake
View File

@@ -1,4 +1,5 @@
set(CMAKE_SYSTEM_NAME QNX)
set(CMAKE_SYSTEM_PROCESSOR x86_64)
if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
@@ -13,7 +14,7 @@ if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
endif()
set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/)
set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET};$ENV{QNX_TARGET}/${CMAKE_SYSTEM_PROCESSOR})
set(_qnx_toolchain_arch gcc_ntox86_64)