[qt5] Further reduce regressions.

Fix issue where generated cmake points at the wrong tools folder.
This commit is contained in:
Robert Schumacher 2017-02-24 15:57:41 -08:00
parent 8f89f41a06
commit df4d385d3d
2 changed files with 4 additions and 5 deletions

View File

@ -1,4 +1,4 @@
Source: qt5 Source: qt5
Version: 5.7.1-4 Version: 5.7.1-5
Description: Qt5 application framework main components. Webengine, examples and tests not included. Description: Qt5 application framework main components. Webengine, examples and tests not included.
Build-Depends: sqlite3, libpq, double-conversion Build-Depends: sqlite3, libpq, double-conversion

View File

@ -71,13 +71,12 @@ vcpkg_execute_required_process(
-no-style-windowsvista -no-style-windowsvista
-no-style-fusion -no-style-fusion
-mp -mp
-nomake examples -nomake tests -nomake examples -nomake tests -no-compile-examples
# Doesn't work: only -skip webengine -skip webengine -skip declarative
-skip webengine -skip connectivity -skip declarative
-qt-sql-sqlite -qt-sql-psql -qt-sql-sqlite -qt-sql-psql
-prefix ${CURRENT_PACKAGES_DIR} -prefix ${CURRENT_PACKAGES_DIR}
-bindir ${CURRENT_PACKAGES_DIR}/bin -bindir ${CURRENT_PACKAGES_DIR}/bin
-hostbindir ${CURRENT_PACKAGES_DIR}/tools -hostbindir ${CURRENT_PACKAGES_DIR}/tools/qt5
-archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5 -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5
-datadir ${CURRENT_PACKAGES_DIR}/share/qt5 -datadir ${CURRENT_PACKAGES_DIR}/share/qt5
-plugindir ${CURRENT_PACKAGES_DIR}/plugins -plugindir ${CURRENT_PACKAGES_DIR}/plugins