mirror of https://github.com/CGAL/cgal
Merged revisions 56638,56640 via svnmerge from
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch ........ r56638 | sloriot | 2010-06-08 13:27:58 +0200 (Tue, 08 Jun 2010) | 3 lines apply modify from r56637 to 3.6-branch ........ r56640 | lrineau | 2010-06-08 14:51:20 +0200 (Tue, 08 Jun 2010) | 2 lines CMake/autolink patch for unofficial MSVC10 support. ........
This commit is contained in:
parent
5d2ee0dc70
commit
fcbd4fd872
|
|
@ -8,7 +8,10 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED )
|
|||
set(CGAL_AUTO_LINK_ENABLED TRUE)
|
||||
endif()
|
||||
|
||||
if ( MSVC90 )
|
||||
if ( MSVC10 )
|
||||
set(CGAL_TOOLSET "vc100")
|
||||
message( STATUS "Using VC10 compiler." )
|
||||
elseif ( MSVC90 )
|
||||
set(CGAL_TOOLSET "vc90")
|
||||
message( STATUS "Using VC90 compiler." )
|
||||
elseif ( MSVC80 )
|
||||
|
|
|
|||
|
|
@ -566,7 +566,9 @@ ELSE (_boost_IN_CACHE)
|
|||
# NOTE: this is not perfect yet, if you experience any issues
|
||||
# please report them and use the Boost_COMPILER variable
|
||||
# to work around the problems.
|
||||
if (MSVC90)
|
||||
if (MSVC10)
|
||||
SET (_boost_COMPILER "-vc100")
|
||||
elseif (MSVC90)
|
||||
SET (_boost_COMPILER "-vc90")
|
||||
elseif (MSVC80)
|
||||
SET (_boost_COMPILER "-vc80")
|
||||
|
|
|
|||
|
|
@ -143,6 +143,11 @@ CGAL_LIB_RT_OPT: A suffix that indicates the runtime library used,
|
|||
// vc90:
|
||||
# define CGAL_LIB_TOOLSET "vc90"
|
||||
|
||||
#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1600)
|
||||
|
||||
// vc10:
|
||||
# define CGAL_LIB_TOOLSET "vc100"
|
||||
|
||||
#elif defined(__BORLANDC__)
|
||||
|
||||
// CBuilder 6:
|
||||
|
|
|
|||
Loading…
Reference in New Issue