From c8926a473a8cfc07d7a88d84f1b667da570cf0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 19 Feb 2014 20:41:28 +0100 Subject: [PATCH 1/3] doc: Only CMAKE_INSTALL_PREFIX is needed. Specifying also CMAKE_FIND_ROOT_PATH has no effect. --- doc/building.dox | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/building.dox b/doc/building.dox index 49823eba2..083e2aba8 100644 --- a/doc/building.dox +++ b/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` -parameters to that directory so CMake knows where to look for installed -libraries and where to install new ones. +When running CMake, set `CMAKE_INSTALL_PREFIX` parameter to that directory so +CMake knows where to look for installed libraries and where to install new +ones. @subsubsection building-windows-msvc Using Visual Studio @@ -104,7 +104,7 @@ 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 . From 19e82abf7d0f96fd6a953ec60d30624f8a6554e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 19 Feb 2014 20:42:05 +0100 Subject: [PATCH 2/3] doc: fix order of arguments when building through CMake. --- doc/building.dox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/building.dox b/doc/building.dox index 083e2aba8..3a9dbe0aa 100644 --- a/doc/building.dox +++ b/doc/building.dox @@ -106,7 +106,7 @@ Studio to load: cd build 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. From b18b19bd11968ff9d191fa778b423b77b10cd80f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 20 Feb 2014 13:07:16 +0100 Subject: [PATCH 3/3] Missing include. Oh well. --- src/Magnum/Implementation/TextureState.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Magnum/Implementation/TextureState.cpp b/src/Magnum/Implementation/TextureState.cpp index ba4022e55..dc1eab00b 100644 --- a/src/Magnum/Implementation/TextureState.cpp +++ b/src/Magnum/Implementation/TextureState.cpp @@ -25,6 +25,8 @@ #include "TextureState.h" +#include + #include "Magnum/AbstractTexture.h" #ifndef MAGNUM_TARGET_GLES #include "Magnum/BufferTexture.h"