diff --git a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
index 9aaed8dd84f..c5728aeacd6 100644
--- a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
+++ b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
@@ -8,8 +8,12 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED )
     set(CGAL_AUTO_LINK_ENABLED TRUE)
   endif()
 
-  if     ( MSVC15 )
-    set(CGAL_TOOLSET "vc150")
+  if ( MSVC_TOOLSET_VERSION )
+    set(CGAL_TOOLSET "vc${TOOLSET_VERSION}")
+    string(SUBSTRING "${MSVC_VERSION}" 0 2 TMP_VC_VERSION)
+    message( STATUS "Using VC ${TMP_VC_VERSION} compiler." )
+  elseif ( MSVC15 )
+    set(CGAL_TOOLSET "vc141")
     message( STATUS "Using VC15 compiler." )
   elseif ( MSVC14 )
     set(CGAL_TOOLSET "vc140")