From 58b647a1c1efa0e7f2982020b39851c42bc4031f Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 27 Sep 2019 13:49:04 +0200 Subject: [PATCH] Fix CGAL_TOOLSET for latest visual compilers. --- .../cmake/modules/CGAL_GeneratorSpecificSettings.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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")