diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7da4d804..6490caf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,13 +23,21 @@ if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}"
 	endif()
 
 	if(GLM_TEST_ENABLE_CXX_1Y)
-		add_definitions(-std=c++1y)
+		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++1y")
+		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+		set(CMAKE_CXX_FLAGS "-std=c++1y")
 	elseif(GLM_TEST_ENABLE_CXX_11)
-		add_definitions(-std=c++11)
+		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
+		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+		set(CMAKE_CXX_FLAGS "-std=c++11")
 	elseif(GLM_TEST_ENABLE_CXX_0X)
-		add_definitions(-std=c++0x)
+		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++0x")
+		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+		set(CMAKE_CXX_FLAGS "-std=c++0x")
 	elseif(GLM_TEST_ENABLE_CXX_98)
-		add_definitions(-std=c++98)
+		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++98")
+		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+		set(CMAKE_CXX_FLAGS "-std=c++98")
 	endif()
 endif()
 
diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp
index 12cda909..20fe8dfe 100644
--- a/test/core/core_setup_message.cpp
+++ b/test/core/core_setup_message.cpp
@@ -104,9 +104,9 @@ int test_compiler()
 	}
 	else if(GLM_COMPILER & GLM_COMPILER_CLANG)
 	{
-#       ifdef __clang_major__
-            std::cout << "GLM_COMPILER_CLANG " << __clang_major__ << "." << __clang_minor__ << std::endl;
-#       endif
+#		ifdef __clang_major__
+			std::cout << "GLM_COMPILER_CLANG " << __clang_major__ << "." << __clang_minor__ << std::endl;
+#		endif
 		switch(GLM_COMPILER)
 		{
 		case GLM_COMPILER_CLANG26: