9773f0175c
We agreed that qt-configure-module needs to come back to bin/ as it's
user-facing.
Amends d77ce33082
[ChangeLog][CMake] Upon further consideration, qt-configure-module
was deemed user-facing, and was thus moved back to ./bin on
all platforms.
Task-number: QTBUG-107621
Change-Id: I1f7874436e5b3988242091fc0303ea828f29d5c6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
47 lines
1.8 KiB
YAML
47 lines
1.8 KiB
YAML
# Call either qt-cmake or qt-configure-module depending on whether the
|
|
# UseConfigure platform configuration feature is set.
|
|
# We should remove the cmake branch, once all platform configurations
|
|
# are ported to use configure.
|
|
type: Group
|
|
instructions:
|
|
- type: Group
|
|
enable_if:
|
|
condition: property
|
|
property: features
|
|
contains_value: UseConfigure
|
|
instructions:
|
|
- type: EnvironmentVariable
|
|
variableName: CONFIGURE_EXECUTABLE
|
|
variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}{{.Env.CI_PATH_SEP}}bin{{.Env.CI_PATH_SEP}}qt-configure-module"
|
|
disable_if:
|
|
condition: property
|
|
property: host.os
|
|
equals_value: Windows
|
|
- type: EnvironmentVariable
|
|
variableName: CONFIGURE_EXECUTABLE
|
|
variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}{{.Env.CI_PATH_SEP}}bin{{.Env.CI_PATH_SEP}}qt-configure-module.bat"
|
|
enable_if:
|
|
condition: property
|
|
property: host.os
|
|
equals_value: Windows
|
|
- type: Group
|
|
disable_if:
|
|
condition: property
|
|
property: features
|
|
contains_value: UseConfigure
|
|
instructions:
|
|
- type: EnvironmentVariable
|
|
variableName: CONFIGURE_EXECUTABLE
|
|
variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}{{.Env.CI_PATH_SEP}}libexec{{.Env.CI_PATH_SEP}}qt-cmake-private"
|
|
disable_if:
|
|
condition: property
|
|
property: host.os
|
|
equals_value: Windows
|
|
- type: EnvironmentVariable
|
|
variableName: CONFIGURE_EXECUTABLE
|
|
variableValue: "{{.InstallDir}}{{.Env.INSTALL_DIR_SUFFIX}}{{.Env.CI_PATH_SEP}}bin{{.Env.CI_PATH_SEP}}qt-cmake-private.bat"
|
|
enable_if:
|
|
condition: property
|
|
property: host.os
|
|
equals_value: Windows
|