Merge branch 'master' into compatibility

doc/building.dox

@@ -89,9 +89,9 @@ subdir (e.g. `C:/Sys/bin`) to PATH so all the DLLs are found when running the
 executables.  If you are using MinGW, the `C:/MinGW` directory is in most cases
 already prepared for exactly this.
 
-When running CMake, set `CMAKE_FIND_ROOT_PATH` and `CMAKE_INSTALL_PREFIX`
+When running CMake, set `CMAKE_INSTALL_PREFIX` parameter to that directory so
-parameters to that directory so CMake knows where to look for installed
+CMake knows where to look for installed libraries and where to install new
-libraries and where to install new ones.
+ones.
 
 @subsubsection building-windows-msvc Using Visual Studio
 
@@ -104,9 +104,9 @@ Studio to load:
 
     mkdir build
     cd build
-    cmake -DCMAKE_FIND_ROOT_PATH="C:/Sys" -DCMAKE_INSTALL_PREFIX="C:/Sys" ..
+    cmake -DCMAKE_INSTALL_PREFIX="C:/Sys" ..
     cmake --build .
-    cmake --build --target install .
+    cmake --build . --target install
 
 If you want to build and install from Visual Studio, just open the `Magnum.sln`
 project file generated by CMake in the build directory.

src/Magnum/Implementation/TextureState.cpp

@@ -25,6 +25,8 @@
 
 #include "TextureState.h"
 
+#include <Corrade/Utility/Assert.h>
+
 #include "Magnum/AbstractTexture.h"
 #ifndef MAGNUM_TARGET_GLES
 #include "Magnum/BufferTexture.h"