diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-01-06 21:36:51 +0100 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-06 12:36:51 -0800 |
| commit | f8165f72709cce797058164b389a105ca4c412a9 (patch) | |
| tree | a57e542c8390a72eae751e222ff5c80627ab1a3b /ports/qt5-xmlpatterns | |
| parent | a17d8cbf955e90efff4556073e203fd252e4e19c (diff) | |
| download | vcpkg-f8165f72709cce797058164b389a105ca4c412a9.tar.gz vcpkg-f8165f72709cce797058164b389a105ca4c412a9.zip | |
[qt5-base] Fix Qt5 linux build and be a bit less flaky in CI (#9260)
* Fix static qt5 builds and ignore system qmake
closes #9234 and #9239
* fix angle conflict and icu dependency
* add egl-registry as a dependency
* remove space
* adding spaces resolved the problem
* move files only if they exist
* Update the Wrapper to use the Postgres target
fixes some observed linkage issues
* update baseline
* add fontconfig on linux so CI is less flaky in a full rebuild
* fix linkage dependent qt5-imageformats libs
* Fix Wrapper for Linux and add other platform libs to Qt5::Core
* fix plugin properties in cmake files
* fix cmake files.
* fix missing plugin qminimal deployment into tools dir
* change wrapper slightly
* UNIX also means APPLE so it needs to be excluded
* fix the static windows build
* mark the parts of fixcmake which require further work to work with single configuration builds
* Update ci.baseline.txt
make qt5-tools pass for CI testing
* fix last regression
* break auto fontconfig in configure script to fix qt5-tools
* update baseline
* enable verbose to debug ci
* try to help it instead of breaking it
* completly link icu
* try to fix fontconfig configure
* fix configure call. cannot be called with a list!
* remove invalid line from patch
* force icu and reduce the required icu libs according to the configure script
* fix icu linkage
* add more icu dependencies and names for windows
* add more icu libs. Seems like all are needed
* fix typo
* print icu libs in debug
* check releasenames
* try again
* change link order
* add icu to wrapper
* fix typo
* patch icu configure for static windows builds
* add other icu libraries to the icu patch
* fix icu in x64-windows-static
* update baseline. VTK builds in local WSL so it should work in CI
* update VTK control to force rebuild
* remove qt5-tools=pass from baseline
* remove qcustomplot:x64-linux=fail from baseline
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'ports/qt5-xmlpatterns')
| -rw-r--r-- | ports/qt5-xmlpatterns/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-xmlpatterns/portfile.cmake | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ports/qt5-xmlpatterns/CONTROL b/ports/qt5-xmlpatterns/CONTROL index 6e7b3d711..15a676498 100644 --- a/ports/qt5-xmlpatterns/CONTROL +++ b/ports/qt5-xmlpatterns/CONTROL @@ -1,4 +1,4 @@ Source: qt5-xmlpatterns
-Version: 5.12.5
+Version: 5.12.5-1
Description: Qt5 XML Patterns Module - Support for XPath, XQuery, XSLT and XML schema validation
Build-Depends: qt5-base, qt5-declarative
diff --git a/ports/qt5-xmlpatterns/portfile.cmake b/ports/qt5-xmlpatterns/portfile.cmake index 214726759..fdbfa8d8e 100644 --- a/ports/qt5-xmlpatterns/portfile.cmake +++ b/ports/qt5-xmlpatterns/portfile.cmake @@ -1,2 +1,5 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake) -qt_submodule_installation()
\ No newline at end of file +qt_submodule_installation() +if(EXISTS "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}") + file(INSTALL "${CURRENT_INSTALLED_DIR}/plugins/platforms/qminimal${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/plugins/platforms") +endif()
\ No newline at end of file |