diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2023-11-06 13:23:42 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2023-11-22 21:15:38 +0100 |
| commit | b4738ebb1e4d2447e9327e34134461c38e639730 (patch) | |
| tree | a0cb4d9e7c0d3e28de95850e4f73034b24a4c013 | |
| parent | d2c6e9ab99f3c4ad6f9b896e0684b0369d5e944d (diff) | |
coin: Fix installation failing during tqtc-qt5.git integrations
During tqtc repo submodule updates, the repo names contain the tqtc-
prefix.
But during the final tqtc-qt5.git integration, the submodule names
don't contain the tqtc- prefix.
This causes errors like:
CMake Error: Error processing file: /qt-cmake-private-install.cmake
Use contains_value in the condition instead of equals_value, to ensure
it works for both scenarios. This assumes there will be no repos that
contain 'qtbase' in their name which are not the original qtbase
repo.
Amends 7e334bc7fc4c6c9de379e19076197af5b7fef9ee
picked from commit 6556a943ce8625ce1043a2da64deed187b7ce209 in the
tqtc repo, so that we don't need to do it for every new lts branch.
Change-Id: Ib38c855525c91032d35c235bf33d860204474fe0
Reviewed-by: Toni Saario <toni.saario@qt.io>
| -rw-r--r-- | coin/instructions/call_host_install.yaml | 4 | ||||
| -rw-r--r-- | coin/instructions/call_target_install.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/coin/instructions/call_host_install.yaml b/coin/instructions/call_host_install.yaml index 1d2bac610e..1d923fa8f5 100644 --- a/coin/instructions/call_host_install.yaml +++ b/coin/instructions/call_host_install.yaml @@ -8,7 +8,7 @@ instructions: enable_if: condition: runtime env_var: TESTED_MODULE_COIN - equals_value: qtbase + contains_value: qtbase userMessageOnFailure: > Failed to install package. - type: ExecuteCommand @@ -19,6 +19,6 @@ instructions: disable_if: condition: runtime env_var: TESTED_MODULE_COIN - equals_value: qtbase + contains_value: qtbase userMessageOnFailure: > Failed to install package. diff --git a/coin/instructions/call_target_install.yaml b/coin/instructions/call_target_install.yaml index 6684ec1062..f2a7fc10ef 100644 --- a/coin/instructions/call_target_install.yaml +++ b/coin/instructions/call_target_install.yaml @@ -8,7 +8,7 @@ instructions: enable_if: condition: runtime env_var: TESTED_MODULE_COIN - equals_value: qtbase + contains_value: qtbase userMessageOnFailure: > Failed to install package. - type: ExecuteCommand @@ -19,6 +19,6 @@ instructions: disable_if: condition: runtime env_var: TESTED_MODULE_COIN - equals_value: qtbase + contains_value: qtbase userMessageOnFailure: > Failed to install package. |