summaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2022-03-31 14:01:38 +0300
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2022-03-31 11:12:32 +0000
commit1f643092b5dcfa9e119d4b6b4c7ac9b7f82bb5cc (patch)
tree5073ad41911cc17e6174d72707b9ea977dd55b23 /coin
parent0702bc0a81a609bdc5afbf184dfc3b26b46c8bb3 (diff)
Coin: update zlib paths to match provisioned version
Change-Id: I2d290f97c11e424e70134c66b8877207e0f1d5cb Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'coin')
-rw-r--r--coin/instructions/common_environment.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
index 989351a82..3aa4c9769 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;C:\\Utils\\zlib-1.2.11;C:\\Utils\\xz-5.2.5\\src\\liblzma\\api;"
+ variableValue: "C:\\Utils\\bzip2-1.0.8;C:\\Utils\\zlib-1.2.12;C:\\Utils\\xz-5.2.5\\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;C:\\Utils\\zlib-1.2.11;C:\\Utils\\xz-5.2.5\\windows\\vs2015\\ReleaseMT\\Win32\\liblzma;"
+ variableValue: "C:\\Utils\\bzip2-1.0.8;C:\\Utils\\zlib-1.2.12;C:\\Utils\\xz-5.2.5\\windows\\vs2015\\ReleaseMT\\Win32\\liblzma;"
enable_if:
condition: property
property: target.compiler