Merge branch 'master' into compatibility

Conflicts: src/Magnum/AbstractShaderProgram.cpp src/Magnum/CubeMapTextureArray.h src/Magnum/Shader.cpp
12 years ago · 317304bf87
23 changed files with 127 additions and 59 deletions
--- a/package/archlinux/PKGBUILD-android-arm
+++ b/package/archlinux/PKGBUILD-android-arm
@ -38,5 +38,5 @@ build() {

 package() {
    cd "$startdir/build-android-arm"
-    DESTDIR="$pkgdir/" ninja install
+    DESTDIR="$pkgdir/" ninja install/strip
 }
--- a/package/archlinux/PKGBUILD-android-x86
+++ b/package/archlinux/PKGBUILD-android-x86
@ -38,5 +38,5 @@ build() {

 package() {
    cd "$startdir/build-android-x86"
-    DESTDIR="$pkgdir/" ninja install
+    DESTDIR="$pkgdir/" ninja install/strip
 }
--- a/package/archlinux/PKGBUILD-mingw32
+++ b/package/archlinux/PKGBUILD-mingw32
@ -34,5 +34,5 @@ build() {

 package() {
  cd "$startdir/build-win"
-  DESTDIR="$pkgdir/" ninja install
+  DESTDIR="$pkgdir/" ninja install/strip
 }
--- a/package/archlinux/PKGBUILD-nacl-glibc
+++ b/package/archlinux/PKGBUILD-nacl-glibc
@ -56,10 +56,10 @@ build() {
 package() {
    # Install 32bit
    cd "$startdir/build-nacl-glibc-x86-32"
-    DESTDIR="$pkgdir/" ninja install
+    DESTDIR="$pkgdir/" ninja install/strip

    # Install 64bit (the headers will be overwritten, but they are (and should
    # be) the same for both versions
    cd "$startdir/build-nacl-glibc-x86-64"
-    DESTDIR="$pkgdir/" ninja install
+    DESTDIR="$pkgdir/" ninja install/strip
 }
--- a/package/archlinux/PKGBUILD-nacl-newlib
+++ b/package/archlinux/PKGBUILD-nacl-newlib
@ -58,16 +58,10 @@ build() {
 package() {
    # Install 32bit
    cd "$startdir/build-nacl-newlib-x86-32"
-    DESTDIR="$pkgdir/" ninja install
-
-    # Strip 32bit binaries
-    /usr/nacl/toolchain/linux_x86_newlib/bin/i686-nacl-strip ${pkgdir}/usr/nacl/bin/*x86-32.nexe
+    DESTDIR="$pkgdir/" ninja install/strip

    # Install 64bit (the headers will be overwritten, but they are (and should
    # be) the same for both versions
    cd "$startdir/build-nacl-newlib-x86-64"
-    DESTDIR="$pkgdir/" ninja install
-
-    # Strip 64bit binaries
-    /usr/nacl/toolchain/linux_x86_newlib/bin/x86_64-nacl-strip ${pkgdir}/usr/nacl/bin/*x86-64.nexe
+    DESTDIR="$pkgdir/" ninja install/strip
 }
--- a/src/Magnum/AbstractShaderProgram.cpp
+++ b/src/Magnum/AbstractShaderProgram.cpp
@ -36,6 +36,10 @@
 #include "Implementation/ShaderProgramState.h"
 #include "Implementation/State.h"

+#if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) || defined(__MINGW32__)
+#include <sstream>
+#endif
+
 namespace Magnum {

 Int AbstractShaderProgram::maxVertexAttributes() {
@ -293,6 +297,12 @@ bool AbstractShaderProgram::link(std::initializer_list<std::reference_wrapper<Ab
            glGetProgramInfoLog(shader._id, message.size(), nullptr, &message[0]);
        message.resize(std::max(logLength, 1)-1);

+        /** @todo Remove when this is fixed everywhere (also the include above) */
+        #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) || defined(__MINGW32__)
+        std::ostringstream converter;
+        converter << i;
+        #endif
+
        /* Show error log */
        if(!success) {
            Error out;
@ -300,11 +310,15 @@ bool AbstractShaderProgram::link(std::initializer_list<std::reference_wrapper<Ab
            out.setFlag(Debug::SpaceAfterEachValue, false);
            out << "AbstractShaderProgram::link(): linking";
            if(shaders.size() != 1) {
+                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) && !defined(__MINGW32__)
                #ifndef CORRADE_GCC44_COMPATIBILITY
                out << " of shader " << std::to_string(i);
                #else
                out << " of shader " << std::to_string(static_cast<long long int>(i));
                #endif
+                #else
+                out << " of shader " << converter.str();
+                #endif
            }
            out << " failed with the following message:\n"
                << message;
@ -316,11 +330,15 @@ bool AbstractShaderProgram::link(std::initializer_list<std::reference_wrapper<Ab
            out.setFlag(Debug::SpaceAfterEachValue, false);
            out << "AbstractShaderProgram::link(): linking";
            if(shaders.size() != 1) {
+                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) && !defined(__MINGW32__)
                #ifndef CORRADE_GCC44_COMPATIBILITY
                out << " of shader " << std::to_string(i);
                #else
                out << " of shader " << std::to_string(static_cast<long long int>(i));
                #endif
+                #else
+                out << " of shader " << converter.str();
+                #endif
            }
            out << " succeeded with the following message:\n"
                << message;
--- a/src/Magnum/CubeMapTextureArray.h
+++ b/src/Magnum/CubeMapTextureArray.h
@ -99,13 +99,36 @@ class CubeMapTextureArray: public AbstractTexture {
        }
        #endif

-        /** @copydoc Texture::setBaseLevel() */
+        /**
+         * @brief Set base mip level
+         * @return Reference to self (for method chaining)
+         *
+         * Taken into account when generating mipmap using @ref generateMipmap()
+         * and when considering texture completeness when using mipmap
+         * filtering. Initial value is `0`.
+         * @see @ref setMaxLevel(), @ref setMinificationFilter(),
+         *      @fn_gl{ActiveTexture}, @fn_gl{BindTexture} and @fn_gl{TexParameter}
+         *      or @fn_gl_extension{TextureParameter,EXT,direct_state_access}
+         *      with @def_gl{TEXTURE_BASE_LEVEL}
+         */
        CubeMapTextureArray& setBaseLevel(Int level) {
            AbstractTexture::setBaseLevel(level);
            return *this;
        }

-        /** @copydoc Texture::setMaxLevel() */
+        /**
+         * @brief Set max mip level
+         * @return Reference to self (for method chaining)
+         *
+         * Taken into account when generating mipmap using @ref generateMipmap()
+         * and when considering texture completeness when using mipmap
+         * filtering. Initial value is `1000`, which is clamped to count of
+         * levels specified when using @ref setStorage().
+         * @see @ref setBaseLevel(), @ref setMinificationFilter(),
+         *      @fn_gl{ActiveTexture}, @fn_gl{BindTexture} and @fn_gl{TexParameter}
+         *      or @fn_gl_extension{TextureParameter,EXT,direct_state_access}
+         *      with @def_gl{TEXTURE_MAX_LEVEL}
+         */
        CubeMapTextureArray& setMaxLevel(Int level) {
            AbstractTexture::setMaxLevel(level);
            return *this;
@ -129,19 +152,19 @@ class CubeMapTextureArray: public AbstractTexture {
            return *this;
        }

-        /** @copydoc Texture::setBorderColor() */
+        /** @copydoc RectangleTexture::setBorderColor(const Color4&) */
        CubeMapTextureArray& setBorderColor(const Color4& color) {
            AbstractTexture::setBorderColor(color);
            return *this;
        }

-        /** @copydoc Texture::setBorderColor(const Vector4ui&) */
+        /** @copydoc RectangleTexture::setBorderColor(const Vector4ui&) */
        CubeMapTextureArray& setBorderColor(const Vector4ui& color) {
            AbstractTexture::setBorderColor(color);
            return *this;
        }

-        /** @copydoc Texture::setBorderColor(const Vector4i&) */
+        /** @copydoc RectangleTexture::setBorderColor(const Vector4i&) */
        CubeMapTextureArray& setBorderColor(const Vector4i& color) {
            AbstractTexture::setBorderColor(color);
            return *this;
--- a/src/Magnum/RectangleTexture.h
+++ b/src/Magnum/RectangleTexture.h
@ -137,25 +137,48 @@ class RectangleTexture: public AbstractTexture {
            return *this;
        }

-        /** @copydoc Texture::setBorderColor() */
+        /**
+         * @brief Set border color
+         * @return Reference to self (for method chaining)
+         *
+         * Border color when wrapping is set to @ref Sampler::Wrapping::ClampToBorder.
+         * If @extension{EXT,direct_state_access} is not available, the texture
+         * is bound to some texture unit before the operation. Initial value is
+         * `{0.0f, 0.0f, 0.0f, 0.0f}`.
+         * @see @fn_gl{ActiveTexture}, @fn_gl{BindTexture} and @fn_gl{TexParameter}
+         *      or @fn_gl_extension{TextureParameter,EXT,direct_state_access}
+         *      with @def_gl{TEXTURE_BORDER_COLOR}
+         */
        RectangleTexture& setBorderColor(const Color4& color) {
            AbstractTexture::setBorderColor(color);
            return *this;
        }

-        #ifndef MAGNUM_TARGET_GLES
-        /** @copydoc Texture::setBorderColor(const Vector4ui&) */
+        /**
+         * @brief Set border color for integer texture
+         * @return Reference to self (for method chaining)
+         *
+         * Border color for integer textures when wrapping is set to
+         * @ref Sampler::Wrapping::ClampToBorder. If @extension{EXT,direct_state_access}
+         * is not available, the texture is bound to some texture unit before
+         * the operation. Initial value is `{0, 0, 0, 0}`.
+         * @see @fn_gl{ActiveTexture}, @fn_gl{BindTexture} and @fn_gl{TexParameter}
+         *      or @fn_gl_extension{TextureParameter,EXT,direct_state_access}
+         *      with @def_gl{TEXTURE_BORDER_COLOR}
+         * @requires_gl30 %Extension @extension{EXT,texture_integer}
+         */
        RectangleTexture& setBorderColor(const Vector4ui& color) {
            AbstractTexture::setBorderColor(color);
            return *this;
        }

-        /** @copydoc Texture::setBorderColor(const Vector4i&) */
+        /** @overload
+         * @requires_gl30 %Extension @extension{EXT,texture_integer}
+         */
        RectangleTexture& setBorderColor(const Vector4i& color) {
            AbstractTexture::setBorderColor(color);
            return *this;
        }
-        #endif

        /** @copydoc Texture::setMaxAnisotropy() */
        RectangleTexture& setMaxAnisotropy(Float anisotropy) {
@ -190,7 +213,6 @@ class RectangleTexture: public AbstractTexture {
            return *this;
        }

-        #ifndef MAGNUM_TARGET_GLES
        /**
         * @brief Read texture to image
         * @param image             %Image where to put the data
@ -206,7 +228,6 @@ class RectangleTexture: public AbstractTexture {
         * and @extension{ARB,robustness} are available, the DSA version is
         * used, because it is better for performance and there isn't any
         * function combining both features.
-         * @requires_gl %Texture image queries are not available in OpenGL ES.
         * @see @fn_gl{ActiveTexture}, @fn_gl{BindTexture} and
         *      @fn_gl{GetTexLevelParameter} or @fn_gl_extension{GetTextureLevelParameter,EXT,direct_state_access}
         *      with @def_gl{TEXTURE_WIDTH} and @def_gl{TEXTURE_HEIGHT}, then
@ -223,12 +244,10 @@ class RectangleTexture: public AbstractTexture {
         * @param usage             %Buffer usage
         *
         * See @ref image(Image2D&) for more information.
-         * @requires_gl %Texture image queries are not available in OpenGL ES.
         */
        void image(BufferImage2D& image, BufferUsage usage) {
            AbstractTexture::image<2>(_target, 0, image, usage);
        }
-        #endif

        /**
         * @brief Set image data
@ -250,7 +269,6 @@ class RectangleTexture: public AbstractTexture {
            return *this;
        }

-        #ifndef MAGNUM_TARGET_GLES2
        /** @overload */
        RectangleTexture& setImage(TextureFormat internalFormat, BufferImage2D& image) {
            DataHelper<2>::setImage(*this, _target, 0, internalFormat, image);
@ -261,7 +279,6 @@ class RectangleTexture: public AbstractTexture {
        RectangleTexture& setImage(TextureFormat internalFormat, BufferImage2D&& image) {
            return setImage(internalFormat, image);
        }
-        #endif

        /**
         * @brief Set image subdata
@ -281,7 +298,6 @@ class RectangleTexture: public AbstractTexture {
            return *this;
        }

-        #ifndef MAGNUM_TARGET_GLES2
        /** @overload */
        RectangleTexture& setSubImage(const Vector2i& offset, BufferImage2D& image) {
            DataHelper<2>::setSubImage(*this, _target, 0, offset, image);
@ -292,7 +308,6 @@ class RectangleTexture: public AbstractTexture {
        RectangleTexture& setSubImage(const Vector2i& offset, BufferImage2D&& image) {
            return setSubImage(offset, image);
        }
-        #endif

        /**
         * @brief Invalidate texture image
--- a/src/Magnum/Shader.cpp
+++ b/src/Magnum/Shader.cpp
@ -672,6 +672,12 @@ bool Shader::compile(std::initializer_list<std::reference_wrapper<Shader>> shade
            glGetShaderInfoLog(shader._id, message.size(), nullptr, &message[0]);
        message.resize(std::max(logLength, 1)-1);

+        /** @todo Remove when this is fixed everywhere (also the include above) */
+        #if defined(CORRADE_TARGET_NACL_NEWLIB) || defined(CORRADE_TARGET_ANDROID) || defined(__MINGW32__)
+        std::ostringstream converter;
+        converter << i;
+        #endif
+
        /* Show error log */
        if(!success) {
            Error out;
@ -680,11 +686,15 @@ bool Shader::compile(std::initializer_list<std::reference_wrapper<Shader>> shade
            out << "Shader::compile(): compilation of " << shaderName(shader._type)
                << " shader";
            if(shaders.size() != 1) {
+                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) && !defined(__MINGW32__)
                #ifndef CORRADE_GCC44_COMPATIBILITY
                out << ' ' << std::to_string(i);
                #else
                out << ' ' << std::to_string(static_cast<long long int>(i));
                #endif
+                #else
+                out << ' ' << converter.str();
+                #endif
            }
            out << " failed with the following message:\n"
                << message;
@ -697,11 +707,15 @@ bool Shader::compile(std::initializer_list<std::reference_wrapper<Shader>> shade
            out << "Shader::compile(): compilation of " << shaderName(shader._type)
                << " shader";
            if(shaders.size() != 1) {
+                #if !defined(CORRADE_TARGET_NACL_NEWLIB) && !defined(CORRADE_TARGET_ANDROID) && !defined(__MINGW32__)
                #ifndef CORRADE_GCC44_COMPATIBILITY
                out << ' ' << std::to_string(i);
                #else
                out << ' ' << std::to_string(static_cast<long long int>(i));
                #endif
+                #else
+                out << ' ' << converter.str();
+                #endif
            }
            out << " succeeded with the following message:\n"
                << message;
--- a/src/Magnum/Texture.h
+++ b/src/Magnum/Texture.h
@ -337,7 +337,11 @@ template<UnsignedInt dimensions> class Texture: public AbstractTexture {
            return *this;
        }

-        /** @overload */
+        /** @overload
+         * @requires_gl30 %Extension @extension{EXT,texture_integer}
+         * @requires_gl Border is available only for float textures in OpenGL
+         *      ES.
+         */
        Texture<dimensions>& setBorderColor(const Vector4i& color) {
            AbstractTexture::setBorderColor(color);
            return *this;
--- a/src/Magnum/TextureArray.h
+++ b/src/Magnum/TextureArray.h
@ -137,7 +137,7 @@ template<UnsignedInt dimensions> class TextureArray: public AbstractTexture {
            return *this;
        }

-        /** @copydoc Texture::setBorderColor() */
+        /** @copydoc Texture::setBorderColor(const Color4&) */
        TextureArray<dimensions>& setBorderColor(const Color4& color) {
            AbstractTexture::setBorderColor(color);
            return *this;
--- a/src/MagnumPlugins/MagnumFont/CMakeLists.txt
+++ b/src/MagnumPlugins/MagnumFont/CMakeLists.txt
@ -45,13 +45,13 @@ endif()
 install(FILES ${MagnumFont_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/MagnumFont)

 if(BUILD_GL_TESTS)
-    add_library(MagnumFontTestLib STATIC $<TARGET_OBJECTS:MagnumFontObjects>)
-    target_link_libraries(MagnumFontTestLib Magnum MagnumText TgaImporterTestLib)
+    add_library(MagnumMagnumFontTestLib STATIC $<TARGET_OBJECTS:MagnumFontObjects>)
+    target_link_libraries(MagnumMagnumFontTestLib Magnum MagnumText MagnumTgaImporterTestLib)

    # On Windows we need to install first and then run the tests to avoid "DLL
    # not found" hell, thus we need to install this too
    if(WIN32 AND NOT CMAKE_CROSSCOMPILING)
-        install(TARGETS MagnumFontTestLib
+        install(TARGETS MagnumMagnumFontTestLib
            RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
            LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
            ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
--- a/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt
+++ b/src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt
@ -28,4 +28,4 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake

 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})

-corrade_add_test(MagnumFontGLTest MagnumFontGLTest.cpp LIBRARIES MagnumFontTestLib ${GL_TEST_LIBRARIES})
+corrade_add_test(MagnumFontGLTest MagnumFontGLTest.cpp LIBRARIES MagnumMagnumFontTestLib ${GL_TEST_LIBRARIES})
--- a/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt
+++ b/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt
@ -39,19 +39,19 @@ add_plugin(MagnumFontConverter ${MAGNUM_PLUGINS_FONTCONVERTER_DEBUG_INSTALL_DIR}
 target_link_libraries(MagnumFontConverter Magnum MagnumText)

 if(WIN32)
-    target_link_libraries(MagnumFontConverter TgaImageConverter)
+    target_link_libraries(MagnumFontConverter MagnumTgaImageConverter)
 endif()

 install(FILES ${MagnumFontConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/MagnumFontConverter)

 if(BUILD_GL_TESTS)
-    add_library(MagnumFontConverterTestLib STATIC $<TARGET_OBJECTS:MagnumFontConverterObjects>)
-    target_link_libraries(MagnumFontConverterTestLib Magnum MagnumText TgaImageConverterTestLib)
+    add_library(MagnumMagnumFontConverterTestLib STATIC $<TARGET_OBJECTS:MagnumFontConverterObjects>)
+    target_link_libraries(MagnumMagnumFontConverterTestLib Magnum MagnumText MagnumTgaImageConverterTestLib)

    # On Windows we need to install first and then run the tests to avoid "DLL
    # not found" hell, thus we need to install this too
    if(WIN32 AND NOT CMAKE_CROSSCOMPILING)
-        install(TARGETS MagnumFontConverterTestLib
+        install(TARGETS MagnumMagnumFontConverterTestLib
            RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
            LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
            ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
--- a/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt
+++ b/src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt
@ -29,6 +29,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})

 corrade_add_test(MagnumFontConverterGLTest MagnumFontConverterGLTest.cpp LIBRARIES
-    MagnumFontConverterTestLib
-    TgaImporterTestLib
+    MagnumMagnumFontConverterTestLib
+    MagnumTgaImporterTestLib
    ${GL_TEST_LIBRARIES})
--- a/src/MagnumPlugins/ObjImporter/CMakeLists.txt
+++ b/src/MagnumPlugins/ObjImporter/CMakeLists.txt
@ -37,13 +37,13 @@ target_link_libraries(ObjImporter Magnum MagnumMeshTools)
 install(FILES ObjImporter.h DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/ObjImporter)

 if(BUILD_TESTS)
-    add_library(ObjImporterTestLib STATIC $<TARGET_OBJECTS:ObjImporterObjects>)
-    target_link_libraries(ObjImporterTestLib Magnum MagnumMeshTools)
+    add_library(MagnumObjImporterTestLib STATIC $<TARGET_OBJECTS:ObjImporterObjects>)
+    target_link_libraries(MagnumObjImporterTestLib Magnum MagnumMeshTools)

    # On Windows we need to install first and then run the tests to avoid "DLL
    # not found" hell, thus we need to install this too
    if(WIN32 AND NOT CMAKE_CROSSCOMPILING)
-        install(TARGETS ObjImporterTestLib
+        install(TARGETS MagnumObjImporterTestLib
            RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
            LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
            ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
--- a/src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt
+++ b/src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt
@ -28,4 +28,4 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake

 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})

-corrade_add_test(ObjImporterTest Test.cpp LIBRARIES ObjImporterTestLib)
+corrade_add_test(ObjImporterTest Test.cpp LIBRARIES MagnumObjImporterTestLib)
--- a/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
+++ b/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
@ -41,13 +41,13 @@ target_link_libraries(TgaImageConverter Magnum)
 install(FILES ${TgaImageConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImageConverter)

 if(BUILD_TESTS)
-    add_library(TgaImageConverterTestLib ${SHARED_OR_STATIC} $<TARGET_OBJECTS:TgaImageConverterObjects>)
-    target_link_libraries(TgaImageConverterTestLib Magnum)
+    add_library(MagnumTgaImageConverterTestLib ${SHARED_OR_STATIC} $<TARGET_OBJECTS:TgaImageConverterObjects>)
+    target_link_libraries(MagnumTgaImageConverterTestLib Magnum)

    # On Windows we need to install first and then run the tests to avoid "DLL
    # not found" hell, thus we need to install this too
    if(WIN32 AND NOT CMAKE_CROSSCOMPILING)
-        install(TARGETS TgaImageConverterTestLib
+        install(TARGETS MagnumTgaImageConverterTestLib
            RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
            LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
            ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
--- a/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt
+++ b/src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt
@ -28,4 +28,4 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake

 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})

-corrade_add_test(TgaImageConverterTest TgaImageConverterTest.cpp LIBRARIES TgaImageConverterTestLib TgaImporterTestLib)
+corrade_add_test(TgaImageConverterTest TgaImageConverterTest.cpp LIBRARIES MagnumTgaImageConverterTestLib MagnumTgaImporterTestLib)
--- a/src/MagnumPlugins/TgaImporter/CMakeLists.txt
+++ b/src/MagnumPlugins/TgaImporter/CMakeLists.txt
@ -42,13 +42,13 @@ target_link_libraries(TgaImporter Magnum)
 install(FILES ${TgaImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImporter)

 if(BUILD_TESTS)
-    add_library(TgaImporterTestLib ${SHARED_OR_STATIC} $<TARGET_OBJECTS:TgaImporterObjects>)
-    target_link_libraries(TgaImporterTestLib Magnum)
+    add_library(MagnumTgaImporterTestLib ${SHARED_OR_STATIC} $<TARGET_OBJECTS:TgaImporterObjects>)
+    target_link_libraries(MagnumTgaImporterTestLib Magnum)

    # On Windows we need to install first and then run the tests to avoid "DLL
    # not found" hell, thus we need to install this too
    if(WIN32 AND NOT CMAKE_CROSSCOMPILING)
-        install(TARGETS TgaImporterTestLib
+        install(TARGETS MagnumTgaImporterTestLib
            RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
            LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
            ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
--- a/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt
+++ b/src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt
@ -28,4 +28,4 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake

 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})

-corrade_add_test(TgaImporterTest TgaImporterTest.cpp LIBRARIES TgaImporterTestLib)
+corrade_add_test(TgaImporterTest TgaImporterTest.cpp LIBRARIES MagnumTgaImporterTestLib)
--- a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
+++ b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
@ -48,13 +48,13 @@ target_link_libraries(WavAudioImporter Magnum MagnumAudio)
 install(FILES ${WavAudioImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/WavAudioImporter)

 if(BUILD_TESTS)
-    add_library(WavAudioImporterTestLib STATIC $<TARGET_OBJECTS:WavAudioImporterObjects>)
-    target_link_libraries(WavAudioImporterTestLib Magnum MagnumAudio)
+    add_library(MagnumWavAudioImporterTestLib STATIC $<TARGET_OBJECTS:WavAudioImporterObjects>)
+    target_link_libraries(MagnumWavAudioImporterTestLib Magnum MagnumAudio)

    # On Windows we need to install first and then run the tests to avoid "DLL
    # not found" hell, thus we need to install this too
    if(WIN32 AND NOT CMAKE_CROSSCOMPILING)
-        install(TARGETS WavAudioImporterTestLib
+        install(TARGETS MagnumWavAudioImporterTestLib
            RUNTIME DESTINATION ${MAGNUM_BINARY_INSTALL_DIR}
            LIBRARY DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR}
            ARCHIVE DESTINATION ${MAGNUM_LIBRARY_INSTALL_DIR})
--- a/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt
+++ b/src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt
@ -28,4 +28,4 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake

 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})

-corrade_add_test(WavAudioImporterTest WavImporterTest.cpp LIBRARIES WavAudioImporterTestLib)
+corrade_add_test(WavAudioImporterTest WavImporterTest.cpp LIBRARIES MagnumWavAudioImporterTestLib)