From df4d385d3d88c3b4fdd46d9e9f580b5d902accbd Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 24 Feb 2017 15:57:41 -0800 Subject: [PATCH] [qt5] Further reduce regressions. Fix issue where generated cmake points at the wrong tools folder. --- ports/qt5/CONTROL | 2 +- 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