ic
/
magnum-bindings
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

package/ci: adapt to Corrade and Magnum changes.

pull/16/head
Vladimír Vondruš 4 years ago
parent
737ec6c415
commit
5fd2033103
4 changed files with 127 additions and 127 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 70
      package/ci/appveyor-desktop-gles.bat
  2. 64
      package/ci/appveyor-desktop.bat
  3. 58
      package/ci/unix-desktop-gles.sh
  4. 62
      package/ci/unix-desktop.sh

70
package/ci/appveyor-desktop-gles.bat
Unescape View File

@ -21,12 +21,12 @@ mkdir build && cd build || exit /b
cmake .. ^ cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DBUILD_DEPRECATED=OFF ^ -DCORRADE_BUILD_DEPRECATED=OFF ^
-DBUILD_STATIC=%BUILD_STATIC% ^ -DCORRADE_BUILD_STATIC=%BUILD_STATIC% ^
-DWITH_INTERCONNECT=OFF ^ -DCORRADE_WITH_INTERCONNECT=OFF ^
-DWITH_PLUGINMANAGER=ON ^ -DCORRADE_WITH_PLUGINMANAGER=ON ^
-DWITH_TESTSUITE=ON ^ -DCORRADE_WITH_TESTSUITE=ON ^
-DUTILITY_USE_ANSI_COLORS=ON ^ -DCORRADE_UTILITY_USE_ANSI_COLORS=ON ^
-G Ninja || exit /b -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b
@ -39,29 +39,29 @@ mkdir build && cd build || exit /b
cmake .. ^ cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DBUILD_DEPRECATED=OFF ^ -DMAGNUM_BUILD_DEPRECATED=OFF ^
-DBUILD_STATIC=%BUILD_STATIC% ^ -DMAGNUM_BUILD_STATIC=%BUILD_STATIC% ^
-DTARGET_GLES=ON ^ -DMAGNUM_TARGET_GLES=ON ^
-DTARGET_GLES2=%TARGET_GLES2% ^ -DMAGNUM_TARGET_GLES2=%TARGET_GLES2% ^
-DTARGET_DESKTOP_GLES=ON ^ -DMAGNUM_TARGET_DESKTOP_GLES=ON ^
-DWITH_AUDIO=OFF ^ -DMAGNUM_WITH_AUDIO=OFF ^
-DWITH_DEBUGTOOLS=OFF ^ -DMAGNUM_WITH_DEBUGTOOLS=OFF ^
-DWITH_GL=ON ^ -DMAGNUM_WITH_GL=ON ^
-DWITH_MESHTOOLS=ON ^ -DMAGNUM_WITH_MESHTOOLS=ON ^
-DWITH_PRIMITIVES=ON ^ -DMAGNUM_WITH_PRIMITIVES=ON ^
-DWITH_SCENEGRAPH=ON ^ -DMAGNUM_WITH_SCENEGRAPH=ON ^
-DWITH_SCENETOOLS=OFF ^ -DMAGNUM_WITH_SCENETOOLS=OFF ^
-DWITH_SHADERS=ON ^ -DMAGNUM_WITH_SHADERS=ON ^
-DWITH_SHADERTOOLS=OFF ^ -DMAGNUM_WITH_SHADERTOOLS=OFF ^
-DWITH_TEXT=OFF ^ -DMAGNUM_WITH_TEXT=OFF ^
-DWITH_TEXTURETOOLS=ON ^ -DMAGNUM_WITH_TEXTURETOOLS=ON ^
-DWITH_TRADE=ON ^ -DMAGNUM_WITH_TRADE=ON ^
-DWITH_VK=OFF ^ -DMAGNUM_WITH_VK=OFF ^
-DWITH_SDL2APPLICATION=OFF ^ -DMAGNUM_WITH_SDL2APPLICATION=OFF ^
-DWITH_GLFWAPPLICATION=OFF ^ -DMAGNUM_WITH_GLFWAPPLICATION=OFF ^
-DWITH_WINDOWLESSWGLAPPLICATION=ON ^ -DMAGNUM_WITH_WINDOWLESSWGLAPPLICATION=ON ^
-DWITH_ANYIMAGEIMPORTER=ON ^ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON ^
-DWITH_ANYSCENECONVERTER=ON ^ -DMAGNUM_WITH_ANYSCENECONVERTER=ON ^
-G Ninja || exit /b -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b
@ -74,12 +74,12 @@ mkdir build && cd build || exit /b
cmake .. ^ cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DBUILD_STATIC=%BUILD_STATIC% ^ -DMAGNUM_BUILD_STATIC=%BUILD_STATIC% ^
-DWITH_DDSIMPORTER=ON ^ -DMAGNUM_WITH_DDSIMPORTER=ON ^
-DWITH_GLTFIMPORTER=ON ^ -DMAGNUM_WITH_GLTFIMPORTER=ON ^
-DWITH_STANFORDSCENECONVERTER=ON ^ -DMAGNUM_WITH_STANFORDSCENECONVERTER=ON ^
-DWITH_STBIMAGECONVERTER=ON ^ -DMAGNUM_WITH_STBIMAGECONVERTER=ON ^
-DWITH_STBIMAGEIMPORTER=ON ^ -DMAGNUM_WITH_STBIMAGEIMPORTER=ON ^
-G Ninja || exit /b -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b

64
package/ci/appveyor-desktop.bat
Unescape View File

@ -30,12 +30,12 @@ mkdir build && cd build || exit /b
cmake .. ^ cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DBUILD_DEPRECATED=OFF ^ -DCORRADE_BUILD_DEPRECATED=OFF ^
-DBUILD_STATIC=%BUILD_STATIC% ^ -DCORRADE_BUILD_STATIC=%BUILD_STATIC% ^
-DWITH_INTERCONNECT=OFF ^ -DCORRADE_WITH_INTERCONNECT=OFF ^
-DWITH_PLUGINMANAGER=ON ^ -DCORRADE_WITH_PLUGINMANAGER=ON ^
-DWITH_TESTSUITE=ON ^ -DCORRADE_WITH_TESTSUITE=ON ^
-DUTILITY_USE_ANSI_COLORS=ON ^ -DCORRADE_UTILITY_USE_ANSI_COLORS=ON ^
%COMPILER_EXTRA% -G Ninja || exit /b %COMPILER_EXTRA% -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b
@ -49,26 +49,26 @@ cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
-DBUILD_DEPRECATED=OFF ^ -DMAGNUM_BUILD_DEPRECATED=OFF ^
-DBUILD_STATIC=%BUILD_STATIC% %STATIC_PLUGIN_PATH% ^ -DMAGNUM_BUILD_STATIC=%BUILD_STATIC% %STATIC_PLUGIN_PATH% ^
-DWITH_AUDIO=OFF ^ -DMAGNUM_WITH_AUDIO=OFF ^
-DWITH_DEBUGTOOLS=OFF ^ -DMAGNUM_WITH_DEBUGTOOLS=OFF ^
-DWITH_GL=ON ^ -DMAGNUM_WITH_GL=ON ^
-DWITH_MESHTOOLS=ON ^ -DMAGNUM_WITH_MESHTOOLS=ON ^
-DWITH_PRIMITIVES=ON ^ -DMAGNUM_WITH_PRIMITIVES=ON ^
-DWITH_SCENEGRAPH=ON ^ -DMAGNUM_WITH_SCENEGRAPH=ON ^
-DWITH_SCENETOOLS=OFF ^ -DMAGNUM_WITH_SCENETOOLS=OFF ^
-DWITH_SHADERS=ON ^ -DMAGNUM_WITH_SHADERS=ON ^
-DWITH_SHADERTOOLS=OFF ^ -DMAGNUM_WITH_SHADERTOOLS=OFF ^
-DWITH_TEXT=OFF ^ -DMAGNUM_WITH_TEXT=OFF ^
-DWITH_TEXTURETOOLS=ON ^ -DMAGNUM_WITH_TEXTURETOOLS=ON ^
-DWITH_TRADE=ON ^ -DMAGNUM_WITH_TRADE=ON ^
-DWITH_VK=OFF ^ -DMAGNUM_WITH_VK=OFF ^
-DWITH_SDL2APPLICATION=ON ^ -DMAGNUM_WITH_SDL2APPLICATION=ON ^
-DWITH_GLFWAPPLICATION=ON ^ -DMAGNUM_WITH_GLFWAPPLICATION=ON ^
-DWITH_WINDOWLESSWGLAPPLICATION=ON ^ -DMAGNUM_WITH_WINDOWLESSWGLAPPLICATION=ON ^
-DWITH_ANYIMAGEIMPORTER=ON ^ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON ^
-DWITH_ANYSCENECONVERTER=ON ^ -DMAGNUM_WITH_ANYSCENECONVERTER=ON ^
%COMPILER_EXTRA% -G Ninja || exit /b %COMPILER_EXTRA% -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b
@ -81,12 +81,12 @@ mkdir build && cd build || exit /b
cmake .. ^ cmake .. ^
-DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-DBUILD_STATIC=%BUILD_STATIC% ^ -DMAGNUM_BUILD_STATIC=%BUILD_STATIC% ^
-DWITH_DDSIMPORTER=ON ^ -DMAGNUM_WITH_DDSIMPORTER=ON ^
-DWITH_GLTFIMPORTER=ON ^ -DMAGNUM_WITH_GLTFIMPORTER=ON ^
-DWITH_STANFORDSCENECONVERTER=ON ^ -DMAGNUM_WITH_STANFORDSCENECONVERTER=ON ^
-DWITH_STBIMAGECONVERTER=ON ^ -DMAGNUM_WITH_STBIMAGECONVERTER=ON ^
-DWITH_STBIMAGEIMPORTER=ON ^ -DMAGNUM_WITH_STBIMAGEIMPORTER=ON ^
%COMPILER_EXTRA% -G Ninja || exit /b %COMPILER_EXTRA% -G Ninja || exit /b
cmake --build . || exit /b cmake --build . || exit /b
cmake --build . --target install || exit /b cmake --build . --target install || exit /b

58
package/ci/unix-desktop-gles.sh
Unescape View File

@ -9,10 +9,10 @@ cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DBUILD_DEPRECATED=OFF \ -DCORRADE_BUILD_DEPRECATED=OFF \
-DWITH_INTERCONNECT=OFF \ -DCORRADE_WITH_INTERCONNECT=OFF \
-DWITH_PLUGINMANAGER=ON \ -DCORRADE_WITH_PLUGINMANAGER=ON \
-DWITH_TESTSUITE=ON \ -DCORRADE_WITH_TESTSUITE=ON \
-G Ninja -G Ninja
ninja install ninja install
cd ../.. cd ../..
@ -24,27 +24,27 @@ mkdir build && cd build
cmake .. \ cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DBUILD_DEPRECATED=OFF \
-DCMAKE_PREFIX_PATH="$HOME/swiftshader;$HOME/pybind11" \ -DCMAKE_PREFIX_PATH="$HOME/swiftshader;$HOME/pybind11" \
-DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \ -DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \
-DTARGET_GLES=ON \ -DMAGNUM_BUILD_DEPRECATED=OFF \
-DTARGET_GLES2=$TARGET_GLES2 \ -DMAGNUM_TARGET_GLES=ON \
-DWITH_AUDIO=OFF \ -DMAGNUM_TARGET_GLES2=$TARGET_GLES2 \
-DWITH_DEBUGTOOLS=OFF \ -DMAGNUM_WITH_AUDIO=OFF \
-DWITH_GL=ON \ -DMAGNUM_WITH_DEBUGTOOLS=OFF \
-DWITH_MESHTOOLS=ON \ -DMAGNUM_WITH_GL=ON \
-DWITH_PRIMITIVES=ON \ -DMAGNUM_WITH_MESHTOOLS=ON \
-DWITH_SCENEGRAPH=ON \ -DMAGNUM_WITH_PRIMITIVES=ON \
-DWITH_SCENETOOLS=OFF \ -DMAGNUM_WITH_SCENEGRAPH=ON \
-DWITH_SHADERS=ON \ -DMAGNUM_WITH_SCENETOOLS=OFF \
-DWITH_SHADERTOOLS=OFF \ -DMAGNUM_WITH_SHADERS=ON \
-DWITH_TEXT=OFF \ -DMAGNUM_WITH_SHADERTOOLS=OFF \
-DWITH_TEXTURETOOLS=OFF \ -DMAGNUM_WITH_TEXT=OFF \
-DWITH_TRADE=ON \ -DMAGNUM_WITH_TEXTURETOOLS=OFF \
-DWITH_VK=OFF \ -DMAGNUM_WITH_TRADE=ON \
-DWITH_WINDOWLESSEGLAPPLICATION=ON \ -DMAGNUM_WITH_VK=OFF \
-DWITH_ANYIMAGEIMPORTER=ON \ -DMAGNUM_WITH_WINDOWLESSEGLAPPLICATION=ON \
-DWITH_ANYSCENECONVERTER=ON \ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON \
-DMAGNUM_WITH_ANYSCENECONVERTER=ON \
-G Ninja -G Ninja
ninja install ninja install
cd ../.. cd ../..
@ -61,12 +61,12 @@ cmake .. \
`# otherwise it won't load.` \ `# otherwise it won't load.` \
-DCMAKE_PREFIX_PATH=$HOME/swiftshader \ -DCMAKE_PREFIX_PATH=$HOME/swiftshader \
-DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \ -DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \
-DBUILD_STATIC=$BUILD_STATIC \ -DMAGNUM_BUILD_STATIC=$BUILD_STATIC \
-DWITH_DDSIMPORTER=ON \ -DMAGNUM_WITH_DDSIMPORTER=ON \
-DWITH_GLTFIMPORTER=ON \ -DMAGNUM_WITH_GLTFIMPORTER=ON \
-DWITH_STANFORDSCENECONVERTER=ON \ -DMAGNUM_WITH_STANFORDSCENECONVERTER=ON \
-DWITH_STBIMAGECONVERTER=ON \ -DMAGNUM_WITH_STBIMAGECONVERTER=ON \
-DWITH_STBIMAGEIMPORTER=ON \ -DMAGNUM_WITH_STBIMAGEIMPORTER=ON \
-G Ninja -G Ninja
ninja install ninja install
cd ../.. cd ../..

62
package/ci/unix-desktop.sh
Unescape View File

@ -9,11 +9,11 @@ cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DBUILD_DEPRECATED=OFF \ -DCORRADE_BUILD_DEPRECATED=OFF \
-DBUILD_STATIC=$BUILD_STATIC \ -DCORRADE_BUILD_STATIC=$BUILD_STATIC \
-DWITH_INTERCONNECT=OFF \ -DCORRADE_WITH_INTERCONNECT=OFF \
-DWITH_PLUGINMANAGER=ON \ -DCORRADE_WITH_PLUGINMANAGER=ON \
-DWITH_TESTSUITE=ON \ -DCORRADE_WITH_TESTSUITE=ON \
-G Ninja -G Ninja
ninja install ninja install
cd ../.. cd ../..
@ -26,26 +26,26 @@ cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DBUILD_DEPRECATED=OFF \ -DMAGNUM_BUILD_DEPRECATED=OFF \
-DBUILD_STATIC=$BUILD_STATIC \ -DMAGNUM_BUILD_STATIC=$BUILD_STATIC \
-DWITH_AUDIO=OFF \ -DMAGNUM_WITH_AUDIO=OFF \
-DWITH_DEBUGTOOLS=OFF \ -DMAGNUM_WITH_DEBUGTOOLS=OFF \
-DWITH_GL=ON \ -DMAGNUM_WITH_GL=ON \
-DWITH_MESHTOOLS=ON \ -DMAGNUM_WITH_MESHTOOLS=ON \
-DWITH_PRIMITIVES=ON \ -DMAGNUM_WITH_PRIMITIVES=ON \
-DWITH_SCENEGRAPH=ON \ -DMAGNUM_WITH_SCENEGRAPH=ON \
-DWITH_SCENETOOLS=OFF \ -DMAGNUM_WITH_SCENETOOLS=OFF \
-DWITH_SHADERS=ON \ -DMAGNUM_WITH_SHADERS=ON \
-DWITH_SHADERTOOLS=OFF \ -DMAGNUM_WITH_SHADERTOOLS=OFF \
-DWITH_TEXT=OFF \ -DMAGNUM_WITH_TEXT=OFF \
-DWITH_TEXTURETOOLS=OFF \ -DMAGNUM_WITH_TEXTURETOOLS=OFF \
-DWITH_TRADE=ON \ -DMAGNUM_WITH_TRADE=ON \
-DWITH_VK=OFF \ -DMAGNUM_WITH_VK=OFF \
-DWITH_GLFWAPPLICATION=ON \ -DMAGNUM_WITH_GLFWAPPLICATION=ON \
-DWITH_SDL2APPLICATION=ON \ -DMAGNUM_WITH_SDL2APPLICATION=ON \
-DWITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=ON \ -DMAGNUM_WITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=ON \
-DWITH_ANYIMAGEIMPORTER=ON \ -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON \
-DWITH_ANYSCENECONVERTER=ON \ -DMAGNUM_WITH_ANYSCENECONVERTER=ON \
-G Ninja -G Ninja
# In case of a static build there's no way for the test to know the plugin # In case of a static build there's no way for the test to know the plugin
@ -65,12 +65,12 @@ cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DBUILD_STATIC=$BUILD_STATIC \ -DMAGNUM_BUILD_STATIC=$BUILD_STATIC \
-DWITH_DDSIMPORTER=ON \ -DMAGNUM_WITH_DDSIMPORTER=ON \
-DWITH_GLTFIMPORTER=ON \ -DMAGNUM_WITH_GLTFIMPORTER=ON \
-DWITH_STANFORDSCENECONVERTER=ON \ -DMAGNUM_WITH_STANFORDSCENECONVERTER=ON \
-DWITH_STBIMAGECONVERTER=ON \ -DMAGNUM_WITH_STBIMAGECONVERTER=ON \
-DWITH_STBIMAGEIMPORTER=ON \ -DMAGNUM_WITH_STBIMAGEIMPORTER=ON \
-G Ninja -G Ninja
ninja install ninja install
cd ../.. cd ../..

Write Preview
Loading…
Cancel
Save