diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-13 23:46:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 23:46:16 -0700 |
| commit | 5fa90f67cb9f2d20f366180f236856baf2331e52 (patch) | |
| tree | 0619f31d337db94c0c1bd42af1377b9e4e83e2d5 | |
| parent | 9addc14b37bfd1ee3947328a0fcdffd17d19e4e8 (diff) | |
| parent | a78809e77be6a4a2ae31ace726337e3ade8dcab9 (diff) | |
| download | vcpkg-5fa90f67cb9f2d20f366180f236856baf2331e52.tar.gz vcpkg-5fa90f67cb9f2d20f366180f236856baf2331e52.zip | |
Merge pull request #1264 from bagong/qwt-zlib1
[Qwt]: fix "missing zlib1.dll"
| -rw-r--r-- | ports/qwt/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qwt/portfile.cmake | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL index 7564c1c7b..dd6400764 100644 --- a/ports/qwt/CONTROL +++ b/ports/qwt/CONTROL @@ -1,4 +1,4 @@ Source: qwt -Version: 6.1.3-1 +Version: 6.1.3-2 Description: Qt widgets library for technical applications Build-Depends: qt5 diff --git a/ports/qwt/portfile.cmake b/ports/qwt/portfile.cmake index 109c0bc7c..99f84425a 100644 --- a/ports/qwt/portfile.cmake +++ b/ports/qwt/portfile.cmake @@ -21,6 +21,9 @@ else() ) endif() +# The qwt build requires zlib1.dll +SET(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin") + vcpkg_configure_qmake( SOURCE_PATH ${SOURCE_PATH} ) |