diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index da0fe55..6cec308 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -21,12 +21,12 @@ mkdir build && cd build || exit /b cmake .. ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DBUILD_DEPRECATED=OFF ^ - -DBUILD_STATIC=%BUILD_STATIC% ^ - -DWITH_INTERCONNECT=OFF ^ - -DWITH_PLUGINMANAGER=ON ^ - -DWITH_TESTSUITE=ON ^ - -DUTILITY_USE_ANSI_COLORS=ON ^ + -DCORRADE_BUILD_DEPRECATED=OFF ^ + -DCORRADE_BUILD_STATIC=%BUILD_STATIC% ^ + -DCORRADE_WITH_INTERCONNECT=OFF ^ + -DCORRADE_WITH_PLUGINMANAGER=ON ^ + -DCORRADE_WITH_TESTSUITE=ON ^ + -DCORRADE_UTILITY_USE_ANSI_COLORS=ON ^ -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b @@ -39,29 +39,29 @@ mkdir build && cd build || exit /b cmake .. ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DBUILD_DEPRECATED=OFF ^ - -DBUILD_STATIC=%BUILD_STATIC% ^ - -DTARGET_GLES=ON ^ - -DTARGET_GLES2=%TARGET_GLES2% ^ - -DTARGET_DESKTOP_GLES=ON ^ - -DWITH_AUDIO=OFF ^ - -DWITH_DEBUGTOOLS=OFF ^ - -DWITH_GL=ON ^ - -DWITH_MESHTOOLS=ON ^ - -DWITH_PRIMITIVES=ON ^ - -DWITH_SCENEGRAPH=ON ^ - -DWITH_SCENETOOLS=OFF ^ - -DWITH_SHADERS=ON ^ - -DWITH_SHADERTOOLS=OFF ^ - -DWITH_TEXT=OFF ^ - -DWITH_TEXTURETOOLS=ON ^ - -DWITH_TRADE=ON ^ - -DWITH_VK=OFF ^ - -DWITH_SDL2APPLICATION=OFF ^ - -DWITH_GLFWAPPLICATION=OFF ^ - -DWITH_WINDOWLESSWGLAPPLICATION=ON ^ - -DWITH_ANYIMAGEIMPORTER=ON ^ - -DWITH_ANYSCENECONVERTER=ON ^ + -DMAGNUM_BUILD_DEPRECATED=OFF ^ + -DMAGNUM_BUILD_STATIC=%BUILD_STATIC% ^ + -DMAGNUM_TARGET_GLES=ON ^ + -DMAGNUM_TARGET_GLES2=%TARGET_GLES2% ^ + -DMAGNUM_TARGET_DESKTOP_GLES=ON ^ + -DMAGNUM_WITH_AUDIO=OFF ^ + -DMAGNUM_WITH_DEBUGTOOLS=OFF ^ + -DMAGNUM_WITH_GL=ON ^ + -DMAGNUM_WITH_MESHTOOLS=ON ^ + -DMAGNUM_WITH_PRIMITIVES=ON ^ + -DMAGNUM_WITH_SCENEGRAPH=ON ^ + -DMAGNUM_WITH_SCENETOOLS=OFF ^ + -DMAGNUM_WITH_SHADERS=ON ^ + -DMAGNUM_WITH_SHADERTOOLS=OFF ^ + -DMAGNUM_WITH_TEXT=OFF ^ + -DMAGNUM_WITH_TEXTURETOOLS=ON ^ + -DMAGNUM_WITH_TRADE=ON ^ + -DMAGNUM_WITH_VK=OFF ^ + -DMAGNUM_WITH_SDL2APPLICATION=OFF ^ + -DMAGNUM_WITH_GLFWAPPLICATION=OFF ^ + -DMAGNUM_WITH_WINDOWLESSWGLAPPLICATION=ON ^ + -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON ^ + -DMAGNUM_WITH_ANYSCENECONVERTER=ON ^ -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b @@ -74,12 +74,12 @@ mkdir build && cd build || exit /b cmake .. ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DBUILD_STATIC=%BUILD_STATIC% ^ - -DWITH_DDSIMPORTER=ON ^ - -DWITH_GLTFIMPORTER=ON ^ - -DWITH_STANFORDSCENECONVERTER=ON ^ - -DWITH_STBIMAGECONVERTER=ON ^ - -DWITH_STBIMAGEIMPORTER=ON ^ + -DMAGNUM_BUILD_STATIC=%BUILD_STATIC% ^ + -DMAGNUM_WITH_DDSIMPORTER=ON ^ + -DMAGNUM_WITH_GLTFIMPORTER=ON ^ + -DMAGNUM_WITH_STANFORDSCENECONVERTER=ON ^ + -DMAGNUM_WITH_STBIMAGECONVERTER=ON ^ + -DMAGNUM_WITH_STBIMAGEIMPORTER=ON ^ -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index fe5a3d1..a7677de 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -30,12 +30,12 @@ mkdir build && cd build || exit /b cmake .. ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DBUILD_DEPRECATED=OFF ^ - -DBUILD_STATIC=%BUILD_STATIC% ^ - -DWITH_INTERCONNECT=OFF ^ - -DWITH_PLUGINMANAGER=ON ^ - -DWITH_TESTSUITE=ON ^ - -DUTILITY_USE_ANSI_COLORS=ON ^ + -DCORRADE_BUILD_DEPRECATED=OFF ^ + -DCORRADE_BUILD_STATIC=%BUILD_STATIC% ^ + -DCORRADE_WITH_INTERCONNECT=OFF ^ + -DCORRADE_WITH_PLUGINMANAGER=ON ^ + -DCORRADE_WITH_TESTSUITE=ON ^ + -DCORRADE_UTILITY_USE_ANSI_COLORS=ON ^ %COMPILER_EXTRA% -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b @@ -49,26 +49,26 @@ cmake .. ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^ - -DBUILD_DEPRECATED=OFF ^ - -DBUILD_STATIC=%BUILD_STATIC% %STATIC_PLUGIN_PATH% ^ - -DWITH_AUDIO=OFF ^ - -DWITH_DEBUGTOOLS=OFF ^ - -DWITH_GL=ON ^ - -DWITH_MESHTOOLS=ON ^ - -DWITH_PRIMITIVES=ON ^ - -DWITH_SCENEGRAPH=ON ^ - -DWITH_SCENETOOLS=OFF ^ - -DWITH_SHADERS=ON ^ - -DWITH_SHADERTOOLS=OFF ^ - -DWITH_TEXT=OFF ^ - -DWITH_TEXTURETOOLS=ON ^ - -DWITH_TRADE=ON ^ - -DWITH_VK=OFF ^ - -DWITH_SDL2APPLICATION=ON ^ - -DWITH_GLFWAPPLICATION=ON ^ - -DWITH_WINDOWLESSWGLAPPLICATION=ON ^ - -DWITH_ANYIMAGEIMPORTER=ON ^ - -DWITH_ANYSCENECONVERTER=ON ^ + -DMAGNUM_BUILD_DEPRECATED=OFF ^ + -DMAGNUM_BUILD_STATIC=%BUILD_STATIC% %STATIC_PLUGIN_PATH% ^ + -DMAGNUM_WITH_AUDIO=OFF ^ + -DMAGNUM_WITH_DEBUGTOOLS=OFF ^ + -DMAGNUM_WITH_GL=ON ^ + -DMAGNUM_WITH_MESHTOOLS=ON ^ + -DMAGNUM_WITH_PRIMITIVES=ON ^ + -DMAGNUM_WITH_SCENEGRAPH=ON ^ + -DMAGNUM_WITH_SCENETOOLS=OFF ^ + -DMAGNUM_WITH_SHADERS=ON ^ + -DMAGNUM_WITH_SHADERTOOLS=OFF ^ + -DMAGNUM_WITH_TEXT=OFF ^ + -DMAGNUM_WITH_TEXTURETOOLS=ON ^ + -DMAGNUM_WITH_TRADE=ON ^ + -DMAGNUM_WITH_VK=OFF ^ + -DMAGNUM_WITH_SDL2APPLICATION=ON ^ + -DMAGNUM_WITH_GLFWAPPLICATION=ON ^ + -DMAGNUM_WITH_WINDOWLESSWGLAPPLICATION=ON ^ + -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON ^ + -DMAGNUM_WITH_ANYSCENECONVERTER=ON ^ %COMPILER_EXTRA% -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b @@ -81,12 +81,12 @@ mkdir build && cd build || exit /b cmake .. ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DBUILD_STATIC=%BUILD_STATIC% ^ - -DWITH_DDSIMPORTER=ON ^ - -DWITH_GLTFIMPORTER=ON ^ - -DWITH_STANFORDSCENECONVERTER=ON ^ - -DWITH_STBIMAGECONVERTER=ON ^ - -DWITH_STBIMAGEIMPORTER=ON ^ + -DMAGNUM_BUILD_STATIC=%BUILD_STATIC% ^ + -DMAGNUM_WITH_DDSIMPORTER=ON ^ + -DMAGNUM_WITH_GLTFIMPORTER=ON ^ + -DMAGNUM_WITH_STANFORDSCENECONVERTER=ON ^ + -DMAGNUM_WITH_STBIMAGECONVERTER=ON ^ + -DMAGNUM_WITH_STBIMAGEIMPORTER=ON ^ %COMPILER_EXTRA% -G Ninja || exit /b cmake --build . || exit /b cmake --build . --target install || exit /b diff --git a/package/ci/unix-desktop-gles.sh b/package/ci/unix-desktop-gles.sh index 0d2cc82..8b6856d 100755 --- a/package/ci/unix-desktop-gles.sh +++ b/package/ci/unix-desktop-gles.sh @@ -9,10 +9,10 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_DEPRECATED=OFF \ - -DWITH_INTERCONNECT=OFF \ - -DWITH_PLUGINMANAGER=ON \ - -DWITH_TESTSUITE=ON \ + -DCORRADE_BUILD_DEPRECATED=OFF \ + -DCORRADE_WITH_INTERCONNECT=OFF \ + -DCORRADE_WITH_PLUGINMANAGER=ON \ + -DCORRADE_WITH_TESTSUITE=ON \ -G Ninja ninja install cd ../.. @@ -24,27 +24,27 @@ mkdir build && cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_DEPRECATED=OFF \ -DCMAKE_PREFIX_PATH="$HOME/swiftshader;$HOME/pybind11" \ -DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \ - -DTARGET_GLES=ON \ - -DTARGET_GLES2=$TARGET_GLES2 \ - -DWITH_AUDIO=OFF \ - -DWITH_DEBUGTOOLS=OFF \ - -DWITH_GL=ON \ - -DWITH_MESHTOOLS=ON \ - -DWITH_PRIMITIVES=ON \ - -DWITH_SCENEGRAPH=ON \ - -DWITH_SCENETOOLS=OFF \ - -DWITH_SHADERS=ON \ - -DWITH_SHADERTOOLS=OFF \ - -DWITH_TEXT=OFF \ - -DWITH_TEXTURETOOLS=OFF \ - -DWITH_TRADE=ON \ - -DWITH_VK=OFF \ - -DWITH_WINDOWLESSEGLAPPLICATION=ON \ - -DWITH_ANYIMAGEIMPORTER=ON \ - -DWITH_ANYSCENECONVERTER=ON \ + -DMAGNUM_BUILD_DEPRECATED=OFF \ + -DMAGNUM_TARGET_GLES=ON \ + -DMAGNUM_TARGET_GLES2=$TARGET_GLES2 \ + -DMAGNUM_WITH_AUDIO=OFF \ + -DMAGNUM_WITH_DEBUGTOOLS=OFF \ + -DMAGNUM_WITH_GL=ON \ + -DMAGNUM_WITH_MESHTOOLS=ON \ + -DMAGNUM_WITH_PRIMITIVES=ON \ + -DMAGNUM_WITH_SCENEGRAPH=ON \ + -DMAGNUM_WITH_SCENETOOLS=OFF \ + -DMAGNUM_WITH_SHADERS=ON \ + -DMAGNUM_WITH_SHADERTOOLS=OFF \ + -DMAGNUM_WITH_TEXT=OFF \ + -DMAGNUM_WITH_TEXTURETOOLS=OFF \ + -DMAGNUM_WITH_TRADE=ON \ + -DMAGNUM_WITH_VK=OFF \ + -DMAGNUM_WITH_WINDOWLESSEGLAPPLICATION=ON \ + -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON \ + -DMAGNUM_WITH_ANYSCENECONVERTER=ON \ -G Ninja ninja install cd ../.. @@ -61,12 +61,12 @@ cmake .. \ `# otherwise it won't load.` \ -DCMAKE_PREFIX_PATH=$HOME/swiftshader \ -DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \ - -DBUILD_STATIC=$BUILD_STATIC \ - -DWITH_DDSIMPORTER=ON \ - -DWITH_GLTFIMPORTER=ON \ - -DWITH_STANFORDSCENECONVERTER=ON \ - -DWITH_STBIMAGECONVERTER=ON \ - -DWITH_STBIMAGEIMPORTER=ON \ + -DMAGNUM_BUILD_STATIC=$BUILD_STATIC \ + -DMAGNUM_WITH_DDSIMPORTER=ON \ + -DMAGNUM_WITH_GLTFIMPORTER=ON \ + -DMAGNUM_WITH_STANFORDSCENECONVERTER=ON \ + -DMAGNUM_WITH_STBIMAGECONVERTER=ON \ + -DMAGNUM_WITH_STBIMAGEIMPORTER=ON \ -G Ninja ninja install cd ../.. diff --git a/package/ci/unix-desktop.sh b/package/ci/unix-desktop.sh index f283a91..c051f66 100755 --- a/package/ci/unix-desktop.sh +++ b/package/ci/unix-desktop.sh @@ -9,11 +9,11 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_DEPRECATED=OFF \ - -DBUILD_STATIC=$BUILD_STATIC \ - -DWITH_INTERCONNECT=OFF \ - -DWITH_PLUGINMANAGER=ON \ - -DWITH_TESTSUITE=ON \ + -DCORRADE_BUILD_DEPRECATED=OFF \ + -DCORRADE_BUILD_STATIC=$BUILD_STATIC \ + -DCORRADE_WITH_INTERCONNECT=OFF \ + -DCORRADE_WITH_PLUGINMANAGER=ON \ + -DCORRADE_WITH_TESTSUITE=ON \ -G Ninja ninja install cd ../.. @@ -26,26 +26,26 @@ cmake .. \ -DCMAKE_INSTALL_PREFIX=$HOME/deps \ -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_DEPRECATED=OFF \ - -DBUILD_STATIC=$BUILD_STATIC \ - -DWITH_AUDIO=OFF \ - -DWITH_DEBUGTOOLS=OFF \ - -DWITH_GL=ON \ - -DWITH_MESHTOOLS=ON \ - -DWITH_PRIMITIVES=ON \ - -DWITH_SCENEGRAPH=ON \ - -DWITH_SCENETOOLS=OFF \ - -DWITH_SHADERS=ON \ - -DWITH_SHADERTOOLS=OFF \ - -DWITH_TEXT=OFF \ - -DWITH_TEXTURETOOLS=OFF \ - -DWITH_TRADE=ON \ - -DWITH_VK=OFF \ - -DWITH_GLFWAPPLICATION=ON \ - -DWITH_SDL2APPLICATION=ON \ - -DWITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=ON \ - -DWITH_ANYIMAGEIMPORTER=ON \ - -DWITH_ANYSCENECONVERTER=ON \ + -DMAGNUM_BUILD_DEPRECATED=OFF \ + -DMAGNUM_BUILD_STATIC=$BUILD_STATIC \ + -DMAGNUM_WITH_AUDIO=OFF \ + -DMAGNUM_WITH_DEBUGTOOLS=OFF \ + -DMAGNUM_WITH_GL=ON \ + -DMAGNUM_WITH_MESHTOOLS=ON \ + -DMAGNUM_WITH_PRIMITIVES=ON \ + -DMAGNUM_WITH_SCENEGRAPH=ON \ + -DMAGNUM_WITH_SCENETOOLS=OFF \ + -DMAGNUM_WITH_SHADERS=ON \ + -DMAGNUM_WITH_SHADERTOOLS=OFF \ + -DMAGNUM_WITH_TEXT=OFF \ + -DMAGNUM_WITH_TEXTURETOOLS=OFF \ + -DMAGNUM_WITH_TRADE=ON \ + -DMAGNUM_WITH_VK=OFF \ + -DMAGNUM_WITH_GLFWAPPLICATION=ON \ + -DMAGNUM_WITH_SDL2APPLICATION=ON \ + -DMAGNUM_WITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=ON \ + -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON \ + -DMAGNUM_WITH_ANYSCENECONVERTER=ON \ -G Ninja # 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_RPATH=$HOME/deps/lib \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_STATIC=$BUILD_STATIC \ - -DWITH_DDSIMPORTER=ON \ - -DWITH_GLTFIMPORTER=ON \ - -DWITH_STANFORDSCENECONVERTER=ON \ - -DWITH_STBIMAGECONVERTER=ON \ - -DWITH_STBIMAGEIMPORTER=ON \ + -DMAGNUM_BUILD_STATIC=$BUILD_STATIC \ + -DMAGNUM_WITH_DDSIMPORTER=ON \ + -DMAGNUM_WITH_GLTFIMPORTER=ON \ + -DMAGNUM_WITH_STANFORDSCENECONVERTER=ON \ + -DMAGNUM_WITH_STBIMAGECONVERTER=ON \ + -DMAGNUM_WITH_STBIMAGEIMPORTER=ON \ -G Ninja ninja install cd ../..