Browse Source

package/ci: make tests using static plugins work again.

There's no dynamic Magnum library to autodetect the location from, so we
have to supply the hardcoded path explicitly.
pull/9/head
Vladimír Vondruš 6 years ago
parent
commit
a611455034
  1. 2
      package/ci/appveyor-desktop.bat
  2. 3
      package/ci/appveyor.yml
  3. 2
      package/ci/travis-desktop.sh
  4. 1
      package/ci/travis.yml

2
package/ci/appveyor-desktop.bat

@ -42,7 +42,7 @@ cmake .. ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
-DBUILD_DEPRECATED=OFF ^
-DBUILD_STATIC=%BUILD_STATIC% ^
-DBUILD_STATIC=%BUILD_STATIC% %STATIC_PLUGIN_PATH% ^
-DWITH_AUDIO=OFF ^
-DWITH_DEBUGTOOLS=OFF ^
-DWITH_GL=ON ^

3
package/ci/appveyor.yml

@ -53,6 +53,9 @@ install:
- pip3 install coverage codecov
- IF NOT "%BUILD_STATIC%" == "ON" set BUILD_STATIC=OFF
# The fugly \=/ magic is to replace backward slashes with forward so CMake
# doesn't treat those as escape characters
- IF "%BUILD_STATIC%" == "ON" set "STATIC_PLUGIN_PATH=-DMAGNUM_PLUGINS_DIR=%APPVEYOR_BUILD_FOLDER:\=/%/deps/bin/magnum"
# pybind11. Built in the CI script.
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\v2.3.0.zip appveyor DownloadFile https://github.com/pybind/pybind11/archive/v2.3.0.zip

2
package/ci/travis-desktop.sh

@ -27,7 +27,7 @@ cmake .. \
-DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_DEPRECATED=OFF \
-DBUILD_STATIC=$BUILD_STATIC \
-DBUILD_STATIC=$BUILD_STATIC $STATIC_PLUGIN_PATH \
-DWITH_AUDIO=OFF \
-DWITH_DEBUGTOOLS=OFF \
-DWITH_GL=ON \

1
package/ci/travis.yml

@ -106,6 +106,7 @@ cache:
install:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX=g++-4.8; fi
- if [ "$BUILD_STATIC" != "ON" ]; then export BUILD_STATIC=OFF; fi
- if [ "$BUILD_STATIC" == "ON" ]; then export STATIC_PLUGIN_PATH=-DMAGNUM_PLUGINS_DIR=$HOME/deps/lib/magnum; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-sanitizers" ] ); then export PLATFORM_GL_API=GLX; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-gles" ]; then export PLATFORM_GL_API=EGL; fi
# Download CMake 3.4.3 to ensure we're still compatible with it (Travis has

Loading…
Cancel
Save