From 0a505db0c6153220bccf63ee5bec7ade83562434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 12 Sep 2020 17:55:49 +0200 Subject: [PATCH] package/ci: disable API-independent parts on the desktop GLES builds. --- package/ci/appveyor-desktop-gles.bat | 26 +++++++++++++------------- package/ci/travis-desktop-gles.sh | 27 +++++++++++++-------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index 981dedfcb..0a1d66fd6 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -27,28 +27,28 @@ cmake .. ^ -DTARGET_GLES=ON ^ -DTARGET_GLES2=%TARGET_GLES2% ^ -DTARGET_DESKTOP_GLES=ON ^ - -DWITH_AUDIO=ON ^ + -DWITH_AUDIO=OFF ^ -DWITH_SDL2APPLICATION=OFF ^ -DWITH_WINDOWLESSWGLAPPLICATION=ON ^ -DWITH_WGLCONTEXT=ON ^ -DWITH_OPENGLTESTER=ON ^ - -DWITH_ANYAUDIOIMPORTER=ON ^ - -DWITH_ANYIMAGECONVERTER=ON ^ - -DWITH_ANYIMAGEIMPORTER=ON ^ - -DWITH_ANYSCENECONVERTER=ON ^ - -DWITH_ANYSCENEIMPORTER=ON ^ + -DWITH_ANYAUDIOIMPORTER=OFF ^ + -DWITH_ANYIMAGECONVERTER=OFF ^ + -DWITH_ANYIMAGEIMPORTER=OFF ^ + -DWITH_ANYSCENECONVERTER=OFF ^ + -DWITH_ANYSCENEIMPORTER=OFF ^ -DWITH_MAGNUMFONT=ON ^ -DWITH_MAGNUMFONTCONVERTER=ON ^ - -DWITH_OBJIMPORTER=ON ^ - -DWITH_TGAIMAGECONVERTER=ON ^ - -DWITH_TGAIMPORTER=ON ^ - -DWITH_WAVAUDIOIMPORTER=ON ^ + -DWITH_OBJIMPORTER=OFF ^ + -DWITH_TGAIMAGECONVERTER=OFF ^ + -DWITH_TGAIMPORTER=OFF ^ + -DWITH_WAVAUDIOIMPORTER=OFF ^ -DWITH_DISTANCEFIELDCONVERTER=OFF ^ -DWITH_FONTCONVERTER=OFF ^ - -DWITH_IMAGECONVERTER=ON ^ - -DWITH_SCENECONVERTER=ON ^ + -DWITH_IMAGECONVERTER=OFF ^ + -DWITH_SCENECONVERTER=OFF ^ -DWITH_GL_INFO=ON ^ - -DWITH_AL_INFO=ON ^ + -DWITH_AL_INFO=OFF ^ -DBUILD_TESTS=ON ^ -DBUILD_GL_TESTS=ON ^ -G Ninja || exit /b diff --git a/package/ci/travis-desktop-gles.sh b/package/ci/travis-desktop-gles.sh index 57e5659fc..98ea4ae99 100755 --- a/package/ci/travis-desktop-gles.sh +++ b/package/ci/travis-desktop-gles.sh @@ -27,30 +27,30 @@ cmake .. \ -DCMAKE_INSTALL_RPATH=$HOME/swiftshader/lib \ -DTARGET_GLES=ON \ -DTARGET_GLES2=$TARGET_GLES2 \ - -DWITH_AUDIO=ON \ + -DWITH_AUDIO=OFF \ -DWITH_VK=OFF \ -DWITH_GLFWAPPLICATION=ON \ -DWITH_SDL2APPLICATION=ON \ -DWITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=ON \ -DWITH_${PLATFORM_GL_API}CONTEXT=ON \ -DWITH_OPENGLTESTER=ON \ - -DWITH_ANYAUDIOIMPORTER=ON \ - -DWITH_ANYIMAGECONVERTER=ON \ - -DWITH_ANYIMAGEIMPORTER=ON \ - -DWITH_ANYSCENECONVERTER=ON \ - -DWITH_ANYSCENEIMPORTER=ON \ + -DWITH_ANYAUDIOIMPORTER=OFF \ + -DWITH_ANYIMAGECONVERTER=OFF \ + -DWITH_ANYIMAGEIMPORTER=OFF \ + -DWITH_ANYSCENECONVERTER=OFF \ + -DWITH_ANYSCENEIMPORTER=OFF \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ - -DWITH_OBJIMPORTER=ON \ - -DWITH_TGAIMAGECONVERTER=ON \ - -DWITH_TGAIMPORTER=ON \ - -DWITH_WAVAUDIOIMPORTER=ON \ + -DWITH_OBJIMPORTER=OFF \ + -DWITH_TGAIMAGECONVERTER=OFF \ + -DWITH_TGAIMPORTER=OFF \ + -DWITH_WAVAUDIOIMPORTER=OFF \ -DWITH_DISTANCEFIELDCONVERTER=OFF \ -DWITH_FONTCONVERTER=OFF \ - -DWITH_IMAGECONVERTER=ON \ - -DWITH_SCENECONVERTER=ON \ + -DWITH_IMAGECONVERTER=OFF \ + -DWITH_SCENECONVERTER=OFF \ -DWITH_GL_INFO=ON \ - -DWITH_AL_INFO=ON \ + -DWITH_AL_INFO=OFF \ -DBUILD_TESTS=ON \ -DBUILD_GL_TESTS=ON \ -G Ninja @@ -58,7 +58,6 @@ cmake .. \ ninja -j4 CORRADE_TEST_COLOR=ON ctest -V if [ "$TARGET_GLES2" == "ON" ]; then CORRADE_TEST_COLOR=ON MAGNUM_DISABLE_EXTENSIONS="OES_vertex_array_object" ctest -V -R GLTest; fi -Debug/bin/magnum-al-info > /dev/null Debug/bin/magnum-gl-info --limits > /dev/null # Test install, after running the tests as for them it shouldn't be needed