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

Add support for VC12 (and VC13)

This commit is contained in:
Laurent Rineau 2014-02-11 16:18:39 +01:00
parent 253c17e466
commit 909691f77c
2 changed files with 17 additions and 1 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,7 +8,13 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED )
set(CGAL_AUTO_LINK_ENABLED TRUE) set(CGAL_AUTO_LINK_ENABLED TRUE)
endif() endif()
if ( MSVC11 ) if ( MSVC13 )
set(CGAL_TOOLSET "vc130")
message( STATUS "Using VC13 compiler." )
elseif ( MSVC12 )
set(CGAL_TOOLSET "vc120")
message( STATUS "Using VC12 compiler." )
elsif ( MSVC11 )
set(CGAL_TOOLSET "vc110") set(CGAL_TOOLSET "vc110")
message( STATUS "Using VC11 compiler." ) message( STATUS "Using VC11 compiler." )
elseif ( MSVC10 ) elseif ( MSVC10 )

10
Installation/include/CGAL/auto_link/auto_link.h
View File

@ -165,6 +165,16 @@ CGAL_VERSION: Defined in <CGAL/version.h>
// vc11: // vc11:
# define CGAL_LIB_TOOLSET "vc110" # define CGAL_LIB_TOOLSET "vc110"
#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1800)
// vc12:
# define CGAL_LIB_TOOLSET "vc120"
#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1900)
// vc13:
# define CGAL_LIB_TOOLSET "vc130"
#elif defined(__BORLANDC__) #elif defined(__BORLANDC__)
// CBuilder 6: // CBuilder 6: