songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CGAL_TOOLSET for latest visual compilers.

This commit is contained in:
Maxime Gimeno 2019-09-27 13:49:04 +02:00
parent dc5853cb1f
commit 58b647a1c1
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
View File

@ -8,8 +8,12 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED )
set(CGAL_AUTO_LINK_ENABLED TRUE) set(CGAL_AUTO_LINK_ENABLED TRUE)
endif() endif()
if ( MSVC15 ) if ( MSVC_TOOLSET_VERSION )
set(CGAL_TOOLSET "vc150") 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." ) message( STATUS "Using VC15 compiler." )
elseif ( MSVC14 ) elseif ( MSVC14 )
set(CGAL_TOOLSET "vc140") set(CGAL_TOOLSET "vc140")