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

Cherry-pick that revision from /branches/features/Mesh_3-parallel-cjamin/ 

| ------------------------------------------------------------------------
  | r68020 | cjamin | 2012-03-12 18:27:30 +0100 (Mon, 12 Mar 2012) | 1 line
  | 
  | To be able to build CGAL on MSVC11
  |
  ------------------------------------------------------------------------

It adapts CGAL CMake scripts and CGAL auto-link headers to MSVC2011.

Thanks to Clement Jamin, from Inria, for the patch.
This commit is contained in:
Laurent Rineau 2012-03-19 14:26:17 +00:00
parent 02acd80611
commit a429b26316
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,10 @@ if ( NOT CGAL_GENERATOR_SPECIFIC_SETTINGS_FILE_INCLUDED )
set(CGAL_AUTO_LINK_ENABLED TRUE) set(CGAL_AUTO_LINK_ENABLED TRUE)
endif() endif()
if ( MSVC10 ) if ( MSVC11 )
set(CGAL_TOOLSET "vc110")
message( STATUS "Using VC11 compiler." )
elseif ( MSVC10 )
set(CGAL_TOOLSET "vc100") set(CGAL_TOOLSET "vc100")
message( STATUS "Using VC10 compiler." ) message( STATUS "Using VC10 compiler." )
elseif ( MSVC90 ) elseif ( MSVC90 )

4
Installation/cmake/modules/FindBoost.cmake
View File

@ -566,7 +566,9 @@ ELSE (_boost_IN_CACHE)
# NOTE: this is not perfect yet, if you experience any issues # NOTE: this is not perfect yet, if you experience any issues
# please report them and use the Boost_COMPILER variable # please report them and use the Boost_COMPILER variable
# to work around the problems. # to work around the problems.
if (MSVC10) if (MSVC11)
SET (_boost_COMPILER "-vc110")
elseif (MSVC10)
SET (_boost_COMPILER "-vc100") SET (_boost_COMPILER "-vc100")
elseif (MSVC90) elseif (MSVC90)
SET (_boost_COMPILER "-vc90") SET (_boost_COMPILER "-vc90")

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

@ -155,11 +155,16 @@ CGAL_VERSION: Defined in <CGAL/version.h>
// vc90: // vc90:
# define CGAL_LIB_TOOLSET "vc90" # define CGAL_LIB_TOOLSET "vc90"
#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1600) #elif defined(BOOST_MSVC) && (BOOST_MSVC == 1600)
// vc10: // vc10:
# define CGAL_LIB_TOOLSET "vc100" # define CGAL_LIB_TOOLSET "vc100"
#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1700)
// vc11:
# define CGAL_LIB_TOOLSET "vc110"
#elif defined(__BORLANDC__) #elif defined(__BORLANDC__)
// CBuilder 6: // CBuilder 6: