diff options
| author | JackBoosY <47264268+JackBoosY@users.noreply.github.com> | 2019-07-18 02:39:54 +0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-07-17 11:39:54 -0700 |
| commit | 800fd63cf3c1824784fa8c4caff122ab453661ce (patch) | |
| tree | f3c1484916e1385c60dc6ad6be25dd1d663d5e9d /ports/qt5-declarative | |
| parent | 30a3e3256f27623a3fce643d8d56170e9d3dc256 (diff) | |
| download | vcpkg-800fd63cf3c1824784fa8c4caff122ab453661ce.tar.gz vcpkg-800fd63cf3c1824784fa8c4caff122ab453661ce.zip | |
[qt5]Fix build failure in linux (#7230)
Diffstat (limited to 'ports/qt5-declarative')
| -rw-r--r-- | ports/qt5-declarative/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-declarative/portfile.cmake | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ports/qt5-declarative/CONTROL b/ports/qt5-declarative/CONTROL index 1e7e6f6e6..9b9c79e62 100644 --- a/ports/qt5-declarative/CONTROL +++ b/ports/qt5-declarative/CONTROL @@ -1,4 +1,4 @@ Source: qt5-declarative -Version: 5.12.3-1 +Version: 5.12.3-2 Description: Qt5 Declarative (Quick 2) Module. Includes QtQuick, QtQuickParticles, QtQuickWidgets, QtQml, and QtPacketProtocol. Build-Depends: qt5-modularscripts, qt5-base diff --git a/ports/qt5-declarative/portfile.cmake b/ports/qt5-declarative/portfile.cmake index 1056d1b9f..4c1a11b24 100644 --- a/ports/qt5-declarative/portfile.cmake +++ b/ports/qt5-declarative/portfile.cmake @@ -11,4 +11,15 @@ if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") file(READ "${qt5decpath}" _contents) string(REPLACE [[QT.qmldevtools_private.libs = $$QT_MODULE_HOST_LIB_BASE]] [[QT.qmldevtools_private.libs = $$QT_MODULE_LIB_BASE]] _contents "${_contents}") file(WRITE "${qt5decpath}" "${_contents}") +endif() + +# Copy qt5-declarative tools +# This is a temporary workaround and hope to fix and remove it after the version update. +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + if (EXISTS ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/) + file(RENAME ${CURRENT_PACKAGES_DIR}/tools/qt5-declarative/ ${CURRENT_PACKAGES_DIR}/tools/qt5/) + endif() + if (EXISTS ${CURRENT_PACKAGES_DIR}/lib/libQt5QmlDevTools.a) + file(COPY ${CURRENT_PACKAGES_DIR}/lib/libQt5QmlDevTools.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/) + endif() endif()
\ No newline at end of file |