aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDavid Garcia <48836389+david-antiteum@users.noreply.github.com>2020-01-22 21:42:42 +0100
committerVictor Romero <romerosanchezv@gmail.com>2020-01-22 12:42:42 -0800
commit2204efd414d1df30d861d19cf52f20e04d299c15 (patch)
tree878999d1d9ef956730b86b4f831c1a2e97e6d95a /scripts
parent6d8b6b1bbfaf09c90e49470b9b3b50856b5c7ac5 (diff)
downloadvcpkg-2204efd414d1df30d861d19cf52f20e04d299c15.tar.gz
vcpkg-2204efd414d1df30d861d19cf52f20e04d299c15.zip
[jasper] freeglut is not a dependency in macOS (#9680)
* [jasper] freeglut is not a dependency in macOS Also remove freeimage:x64-osx from baseline as now compiles * ogre fails in macOS
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ci.baseline.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index af974a83f..85e9d353b 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -467,7 +467,6 @@ freeglut:arm64-windows=fail
freeglut:arm-uwp=fail
freeglut:x64-uwp=fail
freeglut:x64-osx=fail
-freeimage:x64-osx=fail
freerdp:arm64-windows=fail
freerdp:arm-uwp=fail
freerdp:x64-osx=fail
@@ -1178,6 +1177,7 @@ ogdf:x64-uwp = skip
ogdf:x64-windows = skip
ogdf:x64-windows-static = skip
ogdf:x86-windows = skip
+ogre:x64-osx=fail
# Conflicts with ogre
ogre-next:arm64-windows = skip
ogre-next:arm-uwp = skip