Merge branch 'master' into 0.9.1

ago%!(EXTRA string=15 years) · eed300aeb5
parent 1cef1cc4d9 33a2629f4a
commit eed300aeb5
3 changed files with 2735 additions and 2701 deletions
--- a/FindGLM.cmake
+++ b/FindGLM.cmake
@ -0,0 +1,12 @@
+if(NOT GLM_PACKAGE_DIR)
+	message("ERROR: GLM_PACKAGE_DIR requires to be set")
+endif(NOT GLM_PACKAGE_DIR)
+
+set(GLM_INCLUDE_DIR ${GLM_PACKAGE_DIR})
+set(GLM_LIBRARY_DIR )
+
+include_directories(${GLM_INCLUDE_DIR})
+
+if(GLM_PACKAGE_DIR AND GLM_INCLUDE_DIR)
+	set(GLM_FOUND "YES")
+endif(GLM_PACKAGE_DIR AND GLM_INCLUDE_DIR)
--- a/doc/src/data.xml
+++ b/doc/src/data.xml
--- a/readme.txt
+++ b/readme.txt
@ -4,6 +4,11 @@ G-Truc Creation
 www.g-truc.net
 glm@g-truc.net

+=============================
+GLM 0.9.0.6: 2010-12-21
+-----------------------------
+- Many matrices bugs fixed
+
 =============================
 GLM 0.9.0.5: 2010-11-01
 -----------------------------