C++ 20

g-truc · Dec 19, 2023 · 603cd87 · 603cd87
1 parent e06df2e
commit 603cd87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
@@ -82,8 +82,8 @@
 
 #if (defined(GLM_FORCE_CXX_UNKNOWN))
 #	define GLM_LANG 0
-#elif defined(GLM_FORCE_CXX2A)
-#	define GLM_LANG (GLM_LANG_CXX2A | GLM_LANG_EXT)
+#elif defined(GLM_FORCE_CXX20)
+#	define GLM_LANG (GLM_LANG_CXX20 | GLM_LANG_EXT)
 #	define GLM_LANG_STL11_FORCED
 #elif defined(GLM_FORCE_CXX17)
 #	define GLM_LANG (GLM_LANG_CXX17 | GLM_LANG_EXT)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -11,7 +11,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(GLM_TEST_ENABLE_CXX_20)
 	set(CMAKE_CXX_STANDARD 20)
-	add_definitions(-DGLM_FORCE_CXX2A)
+	add_definitions(-DGLM_FORCE_CXX20)
 	if(NOT GLM_QUIET)
 		message(STATUS "GLM: Build with C++20 features")
 	endif()