updated CLang version detection

This commit is contained in:
Christophe Riccio 2012-09-23 15:27:47 +01:00
parent 3fc42c9e9e
commit 8b5e63375f
2 changed files with 15 additions and 3 deletions

View File

@ -282,6 +282,10 @@
# define GLM_COMPILER GLM_COMPILER_CLANG32
# elif(__clang_major__ == 3) && (__clang_minor__ == 3)
# define GLM_COMPILER GLM_COMPILER_CLANG33
# elif(__clang_major__ == 4) && (__clang_minor__ == 0)
# define GLM_COMPILER GLM_COMPILER_CLANG40
# elif(__clang_major__ == 4) && (__clang_minor__ == 1)
# define GLM_COMPILER GLM_COMPILER_CLANG41
# else
# define GLM_COMPILER GLM_COMPILER_CLANG
# endif

View File

@ -148,8 +148,8 @@ int test_compiler()
}
else if(GLM_COMPILER & GLM_COMPILER_CLANG)
{
std::cout << "GLM_COMPILER_CLANG" << std::endl;
std::cout << "GLM_COMPILER_CLANG " << __clang_major__ << "." << __clang_minor__ << std::endl;
switch(GLM_COMPILER)
{
case GLM_COMPILER_CLANG26:
@ -170,9 +170,17 @@ int test_compiler()
case GLM_COMPILER_CLANG31:
std::cout << "GLM_COMPILER_CLANG31" << std::endl;
break;
case GLM_COMPILER_CLANG32:
std::cout << "GLM_COMPILER_CLANG32" << std::endl;
break;
case GLM_COMPILER_CLANG33:
std::cout << "GLM_COMPILER_CLANG33" << std::endl;
break;
case GLM_COMPILER_CLANG33:
std::cout << "GLM_COMPILER_CLANG40" << std::endl;
break;
default:
std::cout << "Clang version not detected" << std::endl;
Error += 1;
break;
}
}