diff options
| author | Toni Saario <toni.saario@qt.io> | 2023-08-11 10:53:16 +0300 |
|---|---|---|
| committer | Toni Saario <toni.saario@qt.io> | 2023-08-17 14:44:53 +0300 |
| commit | c6279001c73a11c3bc805cfd44fb3280d87b2e32 (patch) | |
| tree | dbf265e4b3dda8172ae1de54005828c9422239e5 /coin/instructions/cmake_qtbase_build_instructions.yaml | |
| parent | 44b4e5746804bee1a58f1379de0d8197ded4d84c (diff) | |
Use install from libexec for QNX on Windows
It moved to libexec at some point in 6.5.
Pick-to: 6.5 6.6
Change-Id: I1e80c0dd1dc253c08bf509aeb605b863a5d67e47
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin/instructions/cmake_qtbase_build_instructions.yaml')
| -rw-r--r-- | coin/instructions/cmake_qtbase_build_instructions.yaml | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/coin/instructions/cmake_qtbase_build_instructions.yaml b/coin/instructions/cmake_qtbase_build_instructions.yaml index b5cd9f60b7..47c3fabc5a 100644 --- a/coin/instructions/cmake_qtbase_build_instructions.yaml +++ b/coin/instructions/cmake_qtbase_build_instructions.yaml @@ -41,9 +41,14 @@ instructions: - condition: property property: host.os equals_value: Windows - - condition: property - property: target.osVersion - not_in_values: [WebAssembly, Android_ANY] + - condition: and + conditions: + - condition: property + property: target.os + not_equals_value: QNX + - condition: property + property: target.osVersion + not_in_values: [WebAssembly, Android_ANY] - type: EnvironmentVariable variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR variableValue: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}bin" @@ -53,9 +58,14 @@ instructions: - condition: property property: host.os equals_value: Windows - - condition: property - property: target.osVersion - not_in_values: [WebAssembly, Android_ANY] + - condition: and + conditions: + - condition: property + property: target.os + not_equals_value: QNX + - condition: property + property: target.osVersion + not_in_values: [WebAssembly, Android_ANY] - !include "{{qt/qtbase}}/call_host_install.yaml" - type: EnvironmentVariable variableName: DESTDIR |