diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-02-24 15:57:41 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-02-24 16:00:05 -0800 |
| commit | df4d385d3d88c3b4fdd46d9e9f580b5d902accbd (patch) | |
| tree | bb93a25c71c401c2065ac6c64f87f94193b9e9d6 | |
| parent | 8f89f41a065902222b1d349fcdf307c2223ba094 (diff) | |
| download | vcpkg-df4d385d3d88c3b4fdd46d9e9f580b5d902accbd.tar.gz vcpkg-df4d385d3d88c3b4fdd46d9e9f580b5d902accbd.zip | |
[qt5] Further reduce regressions.
Fix issue where generated cmake points at the wrong tools folder.
| -rw-r--r-- | ports/qt5/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5/portfile.cmake | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index f42021c54..cd49d30ab 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,4 +1,4 @@ Source: qt5 -Version: 5.7.1-4 +Version: 5.7.1-5 Description: Qt5 application framework main components. Webengine, examples and tests not included. Build-Depends: sqlite3, libpq, double-conversion diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake index 33a1182d1..bbb171fd5 100644 --- a/ports/qt5/portfile.cmake +++ b/ports/qt5/portfile.cmake @@ -71,13 +71,12 @@ vcpkg_execute_required_process( -no-style-windowsvista -no-style-fusion -mp - -nomake examples -nomake tests - # Doesn't work: only -skip webengine - -skip webengine -skip connectivity -skip declarative + -nomake examples -nomake tests -no-compile-examples + -skip webengine -skip declarative -qt-sql-sqlite -qt-sql-psql -prefix ${CURRENT_PACKAGES_DIR} -bindir ${CURRENT_PACKAGES_DIR}/bin - -hostbindir ${CURRENT_PACKAGES_DIR}/tools + -hostbindir ${CURRENT_PACKAGES_DIR}/tools/qt5 -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5 -datadir ${CURRENT_PACKAGES_DIR}/share/qt5 -plugindir ${CURRENT_PACKAGES_DIR}/plugins |