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>
This commit is contained in:
Toni Saario 2023-08-11 10:53:16 +03:00
parent 44b4e57468
commit c6279001c7
3 changed files with 80 additions and 30 deletions

View File

@ -61,9 +61,14 @@ instructions:
- condition: property - condition: property
property: host.os property: host.os
equals_value: Windows equals_value: Windows
- condition: property - condition: and
property: target.osVersion conditions:
not_in_values: [WebAssembly, Android_ANY] - condition: property
property: target.os
not_equals_value: QNX
- condition: property
property: target.osVersion
not_in_values: [WebAssembly, Android_ANY]
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}host{{.Env.CI_PATH_SEP}}bin" variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}host{{.Env.CI_PATH_SEP}}bin"
@ -73,9 +78,14 @@ instructions:
- condition: property - condition: property
property: host.os property: host.os
equals_value: Windows equals_value: Windows
- condition: property - condition: and
property: target.osVersion conditions:
not_in_values: [WebAssembly, Android_ANY] - 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" - !include "{{qt/qtbase}}/call_host_install.yaml"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: DESTDIR variableName: DESTDIR
@ -123,9 +133,14 @@ instructions:
- condition: property - condition: property
property: host.os property: host.os
equals_value: Windows equals_value: Windows
- condition: property - condition: and
property: target.osVersion conditions:
not_in_values: [WebAssembly, Android_ANY] - condition: property
property: target.os
not_equals_value: QNX
- condition: property
property: target.osVersion
not_in_values: [WebAssembly, Android_ANY]
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}target{{.Env.CI_PATH_SEP}}bin" variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}target{{.Env.CI_PATH_SEP}}bin"
@ -135,9 +150,14 @@ instructions:
- condition: property - condition: property
property: host.os property: host.os
equals_value: Windows equals_value: Windows
- condition: property - condition: and
property: target.osVersion conditions:
not_in_values: [WebAssembly, Android_ANY] - condition: property
property: target.os
not_equals_value: QNX
- condition: property
property: target.osVersion
not_in_values: [WebAssembly, Android_ANY]
- !include "{{qt/qtbase}}/call_target_install.yaml" - !include "{{qt/qtbase}}/call_target_install.yaml"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: DESTDIR variableName: DESTDIR

View File

@ -47,9 +47,14 @@ instructions:
- condition: property - condition: property
property: host.os property: host.os
equals_value: Windows equals_value: Windows
- condition: property - condition: and
property: target.osVersion conditions:
not_in_values: [WebAssembly, Android_ANY] - condition: property
property: target.os
not_equals_value: QNX
- condition: property
property: target.osVersion
not_in_values: [WebAssembly, Android_ANY]
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
variableValue: "{{.BuildDir}}{{.Env.CI_PATH_SEP}}bin" variableValue: "{{.BuildDir}}{{.Env.CI_PATH_SEP}}bin"
@ -59,9 +64,14 @@ instructions:
- condition: property - condition: property
property: host.os property: host.os
equals_value: Windows equals_value: Windows
- condition: property - condition: and
property: target.osVersion conditions:
not_in_values: [WebAssembly, Android_ANY] - 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" - !include "{{qt/qtbase}}/call_host_install.yaml"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: DESTDIR variableName: DESTDIR
@ -124,9 +134,14 @@ instructions:
- condition: property - condition: property
property: host.os property: host.os
equals_value: Windows equals_value: Windows
- condition: property - condition: and
property: target.osVersion conditions:
not_in_values: [WebAssembly, Android_ANY] - condition: property
property: target.os
not_equals_value: QNX
- condition: property
property: target.osVersion
not_in_values: [WebAssembly, Android_ANY]
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
variableValue: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}bin" variableValue: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}bin"
@ -136,9 +151,14 @@ instructions:
- condition: property - condition: property
property: host.os property: host.os
equals_value: Windows equals_value: Windows
- condition: property - condition: and
property: target.osVersion conditions:
not_in_values: [WebAssembly, Android_ANY] - condition: property
property: target.os
not_equals_value: QNX
- condition: property
property: target.osVersion
not_in_values: [WebAssembly, Android_ANY]
- !include "{{qt/qtbase}}/call_target_install.yaml" - !include "{{qt/qtbase}}/call_target_install.yaml"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: DESTDIR variableName: DESTDIR

View File

@ -41,9 +41,14 @@ instructions:
- condition: property - condition: property
property: host.os property: host.os
equals_value: Windows equals_value: Windows
- condition: property - condition: and
property: target.osVersion conditions:
not_in_values: [WebAssembly, Android_ANY] - condition: property
property: target.os
not_equals_value: QNX
- condition: property
property: target.osVersion
not_in_values: [WebAssembly, Android_ANY]
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
variableValue: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}bin" variableValue: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}bin"
@ -53,9 +58,14 @@ instructions:
- condition: property - condition: property
property: host.os property: host.os
equals_value: Windows equals_value: Windows
- condition: property - condition: and
property: target.osVersion conditions:
not_in_values: [WebAssembly, Android_ANY] - 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" - !include "{{qt/qtbase}}/call_host_install.yaml"
- type: EnvironmentVariable - type: EnvironmentVariable
variableName: DESTDIR variableName: DESTDIR