diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-04-10 02:08:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 17:08:01 -0700 |
| commit | 941d5464544eb5812b2cbd6e687c3ebc78ed2624 (patch) | |
| tree | 3000c6ce79df22eed289218be98914f89587d74d /scripts | |
| parent | 0edffcf125ad2feca36dbfe17fc32bc824d07ca4 (diff) | |
| download | vcpkg-941d5464544eb5812b2cbd6e687c3ebc78ed2624.tar.gz vcpkg-941d5464544eb5812b2cbd6e687c3ebc78ed2624.zip | |
[qt5-base, qt5-imageformat] fix issues on osx (#9705)
* [qt5-imageformats] freeglut is not a dependency on osx
* [qt5-base] fontconfig can require iconv on linux and osx
* include the jasper fix to get CI coverage?
* trying to get ci coverage for qt on osx
* Revert "trying to get ci coverage for qt on osx"
This reverts commit 8b9b188839ec90c25b54b49d17cf03c50987a49b.
* apply the correct ci hack
* fix wrapper to include macosx debug suffix
* update baseline
* first try to fix the Qt5 cmake configs at the root.
* fix missing backslash
* fix plugin patch
* fix qt config patch
* remove 90% of fixcmake.py
* update baseline
* experimental removal of fixcmake.py and dll copying into tools/qt5/bin
* fix experimental dll copying.
* fix static windows builds
* fix static builds
* fix plugin copy
* add quotes around configuration to make it work
* remove dll debug messages
* note about the cmake fix
* revert fontconfig changes on linux. Make qt.conf relative and not absolute
* make qt.conf relative
* trying to fix ogre osx ci regression
* fix silly path error
* Revert "trying to fix ogre osx ci regression"
This reverts commit 708d8250d6eae81bb9a030ff7edef22d2ea1e67c.
* add ogre:x64-osx=fail to CI baseline
* retry on osx
* fix configure error. since in qt5-base everything is in the package directory and not in the installed
* revert change to ci.baseline
* update ci baseline
* bump control
* update baseline
* ws change to osg-qt
* reset ci baseline to upstream/master
* update baseline
* fix osg-qt?
* skip ms-angle on osx and linux since the normal angle port should be used!
* update ci baseline
* try adding fontconfig manually
* update ci baseline to remove osg-qt for the time being
* remove manual library.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/ci.baseline.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 62af21fe8..c81014f9c 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-osx=fail
date:arm64-windows=fail
dbow2:x64-osx=fail
dcmtk:arm64-windows=fail
@@ -659,7 +658,6 @@ jemalloc:x64-uwp=fail jemalloc:x64-windows-static=fail
jinja2cpplight:arm-uwp=fail
jinja2cpplight:x64-uwp=fail
-kd-soap:x64-osx=fail
keystone:arm64-windows=fail
keystone:arm-uwp=fail
keystone:x64-uwp=fail
@@ -1124,7 +1122,7 @@ mpir:arm64-windows=fail mpir:arm-uwp=fail
mpir:x64-uwp=fail
-#Conflicts with angle and qt-5base
+#Conflicts with angle
ms-angle:arm64-windows = skip
ms-angle:arm-uwp = skip
ms-angle:x64-linux = skip
@@ -1328,6 +1326,8 @@ osgearth:x64-osx=fail osgearth:x64-linux=fail
osgearth:x64-windows-static=fail
osg-qt:x64-windows-static=fail
+# Missing Fontconfig linkage in vcpkg_cmake_wrapper. Will be fixed by #9860 with the removal of the wrapper.
+osg-qt:x64-osx=fail
osg-qt:x64-linux=ignore
otl:x64-windows=ignore
otl:x64-windows-static=ignore
@@ -1450,7 +1450,6 @@ python3:x64-uwp=fail qca:x64-linux=fail
qca:x64-osx=fail
qca:x64-windows-static=fail
-qcustomplot:x64-osx=fail
qhull:arm-uwp=ignore
qhull:x64-windows-static=ignore
qhull:x64-uwp=ignore
@@ -1458,7 +1457,6 @@ qpid-proton:arm-uwp=fail qpid-proton:x64-uwp=fail
qpid-proton:x64-windows-static=fail
qscintilla:x64-linux=fail
-qscintilla:x64-osx=fail
qt5-activeqt:x64-linux=fail
qt5-activeqt:x64-osx=fail
qt5-macextras:x64-linux=fail
|