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 /scripts | |
| 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 'scripts')
| -rw-r--r-- | scripts/ci.baseline.txt | 20 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_qmake.cmake | 6 |
2 files changed, 5 insertions, 21 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 23f4805c3..87919c1f2 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -304,7 +304,6 @@ cudnn:arm-uwp=fail cudnn:x64-uwp=fail
cudnn:x64-windows-static=fail
cudnn:x86-windows=fail
-cutelyst2:x64-linux=fail
cutelyst2:x64-osx=fail
darknet:arm-uwp=fail
darknet:x64-uwp=fail
@@ -1365,7 +1364,6 @@ python3:x64-uwp=fail qca:x64-linux=fail
qca:x64-osx=fail
qca:x64-windows-static=fail
-qcustomplot:x64-linux=fail
qcustomplot:x64-osx=fail
qhull:arm-uwp=ignore
qhull:x64-windows-static=ignore
@@ -1375,32 +1373,14 @@ qpid-proton:x64-uwp=fail qpid-proton:x64-windows-static=fail
qscintilla:x64-linux=fail
qscintilla:x64-osx=fail
-qt-advanced-docking-system:x64-linux=ignore
qt5-activeqt:x64-linux=fail
qt5-activeqt:x64-osx=fail
-qt5-base:x64-linux=fail
-qt5-charts:x64-linux=ignore
-qt5-connectivity:x64-linux=ignore
-qt5-datavis3d:x64-linux=ignore
qt5-macextras:x64-linux=fail
qt5-macextras:x64-windows=fail
qt5-macextras:x64-windows-static=fail
qt5-macextras:x86-windows=fail
-qt5-mqtt:x64-linux=ignore
-qt5-networkauth:x64-linux=ignore
-qt5-quickcontrols2:x64-linux=ignore
-qt5-remoteobjects:x64-linux=ignore
-qt5-scxml:x64-linux=ignore
-qt5-serialport:x64-linux=ignore
-qt5-speech:x64-linux=ignore
-qt5-tools:x64-linux=ignore
-qt5-tools:x64-windows-static=ignore
-qt5-webchannel:x64-linux=ignore
-qt5-websockets:x64-linux=ignore
-qt5-webview:x64-linux=ignore
qt5-winextras:x64-linux=fail
qt5-winextras:x64-osx=fail
-qt5-xmlpatterns:x64-linux=ignore
quickfast:x64-linux=ignore
quickfix:x64-linux=ignore
quickfix:x64-windows=ignore
diff --git a/scripts/cmake/vcpkg_configure_qmake.cmake b/scripts/cmake/vcpkg_configure_qmake.cmake index ad5682a3d..44230a79e 100644 --- a/scripts/cmake/vcpkg_configure_qmake.cmake +++ b/scripts/cmake/vcpkg_configure_qmake.cmake @@ -20,7 +20,11 @@ function(vcpkg_configure_qmake) # Find qmake executable set(_triplet_hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5/bin) - find_program(QMAKE_COMMAND NAMES qmake PATHS ${VCPKG_QT_HOST_TOOLS_ROOT_DIR}/bin ${_triplet_hostbindir}) + if(DEFINED VCPKG_QT_HOST_TOOLS_ROOT_DIR) + find_program(QMAKE_COMMAND NAMES qmake PATHS ${VCPKG_QT_HOST_TOOLS_ROOT_DIR}/bin ${_triplet_hostbindir} NO_DEFAULT_PATH) + else() + find_program(QMAKE_COMMAND NAMES qmake PATHS ${_triplet_hostbindir} NO_DEFAULT_PATH) + endif() if(NOT QMAKE_COMMAND) message(FATAL_ERROR "vcpkg_configure_qmake: unable to find qmake.") |
