diff --git a/CMakeLists.txt b/CMakeLists.txt
index a49692fe..96cfc151 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,8 +42,14 @@ if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}"
 	option(GLM_TEST_ENABLE_CXX_1Y "Enable C++ 1y" OFF)
 	option(GLM_TEST_ENABLE_CXX_14 "Enable C++ 14" OFF)
 	option(GLM_TEST_ENABLE_CXX_1Z "Enable C++ 1z" OFF)
+	option(GLM_TEST_ENABLE_CXX_17 "Enable C++ 17" OFF)
 
-	if(GLM_TEST_ENABLE_CXX_1Z)
+	if(GLM_TEST_ENABLE_CXX_17)
+		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++17")
+		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
+		set(CMAKE_CXX_FLAGS "-std=c++17")
+		message(STATUS "Build with C++17 features")
+	elseif(GLM_TEST_ENABLE_CXX_1Z)
 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++1z")
 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
 		set(CMAKE_CXX_FLAGS "-std=c++1z")