diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-10-17 13:29:13 +0300 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-10-18 13:24:56 +0300 |
| commit | abafe6d2e1b96fd5899854e7e4dd8c2827c774bd (patch) | |
| tree | 8657630afa2f468c73c14859f933058ec25b3963 /coin | |
| parent | a4c2e924d74328ee5908beb16158c931cfe5d76b (diff) | |
libarchive: support linking with zlib compiled into QtCore
This removes the requirement of provisioning an external library just
for libarchive - as the official IFW binaries already use the zlib
bundled with Qt - and tracking updates from multiple sources.
Task-number: QTIFW-2803
Change-Id: I9878a3e1a9b5d649bc62590746151e2d5fe903ba
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/common_environment.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 7b6a06402..108211f69 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -76,7 +76,7 @@ instructions: - type: PrependToEnvironmentVariable variableName: INCLUDE - variableValue: "C:\\Utils\\bzip2-1.0.8-x64;C:\\Utils\\zlib-1.2.12-x64;C:\\Utils\\xz-5.2.5-x64\\src\\liblzma\\api;" + variableValue: "C:\\Utils\\bzip2-1.0.8-x64;C:\\Utils\\xz-5.2.5-x64\\src\\liblzma\\api;" enable_if: condition: property property: host.os @@ -84,7 +84,7 @@ instructions: - type: PrependToEnvironmentVariable variableName: LIB - variableValue: "C:\\Utils\\bzip2-1.0.8-x64;C:\\Utils\\zlib-1.2.12-x64;C:\\Utils\\xz-5.2.5-x64\\windows\\vs2019\\ReleaseMT\\x64\\liblzma;" + variableValue: "C:\\Utils\\bzip2-1.0.8-x64;C:\\Utils\\xz-5.2.5-x64\\windows\\vs2019\\ReleaseMT\\x64\\liblzma;" enable_if: condition: property property: target.compiler |