From 407a7598aa0f181f356a595896caa351be6016df Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 15 Feb 2016 20:29:55 +0100 Subject: [PATCH] Improved new version of GCC detection #477 --- glm/detail/setup.hpp | 6 +++--- readme.md | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index b700a78d..8fc04d2e 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -42,11 +42,11 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 7 -#define GLM_VERSION_REVISION 2 +#define GLM_VERSION_REVISION 3 #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_VERSION_DISPLAYED)) # define GLM_MESSAGE_VERSION_DISPLAYED -# pragma message ("GLM: version 0.9.7.2") +# pragma message ("GLM: version 0.9.7.3") #endif//GLM_MESSAGE /////////////////////////////////////////////////////////////////////////////////// @@ -313,7 +313,7 @@ # define GLM_COMPILER (GLM_COMPILER_GCC52) # elif (__GNUC__ == 5) && (__GNUC_MINOR__ >= 3) # define GLM_COMPILER (GLM_COMPILER_GCC53) -# elif (__GNUC__ == 6) && (__GNUC_MINOR__ >= 0) +# elif (__GNUC__ >= 6) # define GLM_COMPILER (GLM_COMPILER_GCC60) # else # define GLM_COMPILER (GLM_COMPILER_GCC) diff --git a/readme.md b/readme.md index fe558bc7..9e79a01e 100644 --- a/readme.md +++ b/readme.md @@ -54,6 +54,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) #### [GLM 0.9.7.3](https://github.com/g-truc/glm/tree/0.9.7) - 2016-XX-XX ##### Fixes: - Fixed CMake policy warning +- Fixed GCC 6.0 detection #### [GLM 0.9.7.2](https://github.com/g-truc/glm/releases/tag/0.9.7.2) - 2016-01-03 ##### Fixes: