Skip to content
This repository has been archived by the owner on Apr 4, 2023. It is now read-only.

Commit

Permalink
Provisioning?: Add zlib to conanfiles (for Qt v5.14.1)
Browse files Browse the repository at this point in the history
  • Loading branch information
@annulen
annulen committed Feb 27, 2020
1 parent 5e62595 commit d2d9de6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ icu/65.1@qtproject/stable
libxml2/2.9.10@qtproject/stable
libxslt/1.1.34@qtproject/stable
libjpeg-turbo/2.0.3@qtproject/stable
zlib/1.2.11@qtproject/stable

[generators]
cmake
Expand All @@ -21,6 +22,8 @@ libxslt:shared=True

libjpeg-turbo:shared=False

zlib:shared=False

[imports]
bin, icudt65.dll -> ./bin
bin, icuin65.dll -> ./bin
Expand Down
3 changes: 3 additions & 0 deletions coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ icu/65.1@qtproject/stable
libxml2/2.9.10@qtproject/stable
libxslt/1.1.34@qtproject/stable
libjpeg-turbo/2.0.3@qtproject/stable
zlib/1.2.11@qtproject/stable

[generators]
cmake
Expand All @@ -21,6 +22,8 @@ libxslt:shared=True

libjpeg-turbo:shared=False

zlib:shared=False

[imports]
bin, icudt65.dll -> ./bin
bin, icuin65.dll -> ./bin
Expand Down

0 comments on commit d2d9de6

Please sign in to comment.