From bcf1a723928c5a8b73d5e2241612f298b3d6fcf1 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 8 Dec 2014 21:45:14 +0100 Subject: [PATCH] Fixed libc++ detection #284 --- glm/detail/setup.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index a32406d5..42b6beee 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -453,9 +453,11 @@ // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx // N1720 -#define GLM_HAS_CXX11_STL ( \ - (GLM_LANG & GLM_LANG_CXX11_FLAG) || \ - ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015))) +#if GLM_COMPILER & GLM_COMPILER_CLANG +# define GLM_HAS_CXX11_STL (GLM_LANG & GLM_LANG_CXX11_FLAG) && __has_include(<__config>) +#else +# define GLM_HAS_CXX11_STL (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015) +#endif // N1720 #define GLM_HAS_STATIC_ASSERT ( \