From f0acbbd4aca300a5e7942977fe0ace996d849b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joonas=20Saraj=C3=A4rvi?= Date: Thu, 4 Feb 2016 19:42:25 +0200 Subject: [PATCH] setup: detect GCC 6.0 --- glm/detail/setup.hpp | 3 +++ test/core/core_setup_message.cpp | 3 +++ 2 files changed, 6 insertions(+) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index e455a43b..f3c8609f 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -151,6 +151,7 @@ #define GLM_COMPILER_GCC51 0x02000300 #define GLM_COMPILER_GCC52 0x02000400 #define GLM_COMPILER_GCC53 0x02000500 +#define GLM_COMPILER_GCC60 0x02000600 // CUDA #define GLM_COMPILER_CUDA 0x10000000 @@ -312,6 +313,8 @@ # define GLM_COMPILER (GLM_COMPILER_GCC52) # elif (__GNUC__ == 5) && (__GNUC_MINOR__ >= 3) # define GLM_COMPILER (GLM_COMPILER_GCC53) +# elif (__GNUC__ == 6) && (__GNUC_MINOR__ >= 0) +# define GLM_COMPILER (GLM_COMPILER_GCC60) # else # define GLM_COMPILER (GLM_COMPILER_GCC) # endif diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp index 6c9a3765..3808dece 100644 --- a/test/core/core_setup_message.cpp +++ b/test/core/core_setup_message.cpp @@ -71,6 +71,9 @@ int test_compiler() case GLM_COMPILER_GCC53: std::printf("GLM_COMPILER_GCC53\n"); break; + case GLM_COMPILER_GCC60: + std::printf("GLM_COMPILER_GCC60\n"); + break; default: std::printf("GCC version not detected\n"); Error += 1;