diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 61b3695cfe..3f0afcaf34 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -16,7 +16,13 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
   add_definitions(-D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
 endif()
 
-set(CMAKE_CXX_STANDARD 17)
+if (MSVC)
+  set(CMAKE_CXX_STANDARD 20)
+  set(CMAKE_CXX20_STANDARD_COMPILE_OPTION "-std:c++latest")
+else()
+  set(CMAKE_CXX_STANDARD 17)
+endif()
+
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)