diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0d390847..59d7bc1f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,16 +195,18 @@ elseif(APPLE)
 elseif (WIN32)
   # check compiler version
   message(STATUS "MSVC_VERSION is ${MSVC_VERSION}")
-  if(MSVC_VERSION GREATER 1920 AND MSVC_VERSION LESS 1930)
+  if(MSVC_VERSION GREATER_EQUAL 1930 AND MSVC_VERSION LESS 1940)
+    set(VS2022 ON)
+  elseif(MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1930)
     set(VS2019 ON)
-  elseif(MSVC_VERSION GREATER 1910 AND MSVC_VERSION LESS 1919)
+  elseif(MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS 1919)
     set(VS2017 ON)
-  elseif(MSVC_VERSION GREATER 1899 AND MSVC_VERSION LESS 1910)
+  elseif(MSVC_VERSION GREATER_EQUAL 1900 AND MSVC_VERSION LESS 1910)
     set(VS2015 ON)
   endif()
 
-  if(NOT VS2015 AND NOT VS2017 AND NOT VS2019)
-    message(FATAL_ERROR "You must use Microsoft Visual Studio 2015, 2017 or 2019 as compiler")
+  if(NOT VS2015 AND NOT VS2017 AND NOT VS2019 AND NOT VS2022)
+    message(FATAL_ERROR "You must use Microsoft Visual Studio 2015, 2017, 2019 or greater as compiler")
   endif()
 
   # in alternative we can use ExternalProject