diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-03-09 00:27:54 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-09 00:27:54 -0800 |
| commit | 06bdb67b664e23d0f582684e89914bcc1e46402b (patch) | |
| tree | 52ae1da8638481930790342ced6748acf3da1672 | |
| parent | 9ba7210922bf14fe2310d0d2c69a0dbf3678476e (diff) | |
| download | vcpkg-06bdb67b664e23d0f582684e89914bcc1e46402b.tar.gz vcpkg-06bdb67b664e23d0f582684e89914bcc1e46402b.zip | |
[qt5-base] Targeted fix to address archiving issue (#5608)
| -rw-r--r-- | ports/qt5-base/configure_qt.cmake | 8 | ||||
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ports/qt5-base/configure_qt.cmake b/ports/qt5-base/configure_qt.cmake index b66f6d22e..332c003ec 100644 --- a/ports/qt5-base/configure_qt.cmake +++ b/ports/qt5-base/configure_qt.cmake @@ -32,9 +32,9 @@ function(configure_qt) -debug -prefix ${CURRENT_INSTALLED_DIR}/debug -extprefix ${CURRENT_PACKAGES_DIR}/debug - -hostbindir ${CURRENT_INSTALLED_DIR}/debug/tools/qt5 - -archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug - -datadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug + -hostbindir ${CURRENT_PACKAGES_DIR}/debug/tools/qt5 + -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug + -datadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug -plugindir ${CURRENT_INSTALLED_DIR}/debug/plugins -qmldir ${CURRENT_INSTALLED_DIR}/debug/qml -headerdir ${CURRENT_PACKAGES_DIR}/include @@ -53,7 +53,7 @@ function(configure_qt) -release -prefix ${CURRENT_INSTALLED_DIR} -extprefix ${CURRENT_PACKAGES_DIR} - -hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5 + -hostbindir ${CURRENT_PACKAGES_DIR}/tools/qt5 -archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5 -datadir ${CURRENT_INSTALLED_DIR}/share/qt5 -plugindir ${CURRENT_INSTALLED_DIR}/plugins diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index 8f7d0f012..8a5de56d7 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -127,7 +127,6 @@ file(REMOVE ${BINARY_TOOLS}) file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/debug/bin/*")
list(FILTER BINARY_TOOLS EXCLUDE REGEX "\\.dll\$")
file(REMOVE ${BINARY_TOOLS})
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tools")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
|