From 718421b2b9db0f2d241a7e65b9536d31f3283ac9 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Fri, 27 Sep 2019 14:51:56 +0200 Subject: [PATCH] Add a line in the Supported Compilers about MSVC and CMake --- Documentation/doc/Documentation/Installation.txt | 2 ++ .../cmake/modules/CGAL_GeneratorSpecificSettings.cmake | 8 ++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Documentation/doc/Documentation/Installation.txt b/Documentation/doc/Documentation/Installation.txt index 6b6e8fab0af..587ad7e23be 100644 --- a/Documentation/doc/Documentation/Installation.txt +++ b/Documentation/doc/Documentation/Installation.txt @@ -165,6 +165,8 @@ In order to build the \cgal libraries, you need a \cpp compiler. It may work for older versions of the above listed compilers. +\attention Recent versions of CMake are needed for recent versions of MS Visual C++. Please refer to CMake's documentation for further information. + \section secconfigwithcmake Configuring CGAL with CMake diff --git a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake index c5728aeacd6..366378ea74e 100644 --- a/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake +++ b/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake @@ -9,12 +9,8 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED ) endif() 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." ) + set(CGAL_TOOLSET "vc${MSVC_TOOLSET_VERSION}") + message( STATUS "Using VC toolset ${MSVC_TOOLSET_VERSION}." ) elseif ( MSVC14 ) set(CGAL_TOOLSET "vc140") message( STATUS "Using VC14 compiler." )