diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index f233c9d..fb7113d 100644 --- a/package/ci/appveyor-desktop.bat +++ b/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 ^ diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml index c4ed570..f522171 100644 --- a/package/ci/appveyor.yml +++ b/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 diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh index c3bc2c2..48e4d80 100755 --- a/package/ci/travis-desktop.sh +++ b/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 \ diff --git a/package/ci/travis.yml b/package/ci/travis.yml index 72006db..37a7e32 100644 --- a/package/ci/travis.yml +++ b/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