Ticket #8750: boost_vc12.patch

File boost_vc12.patch, 2.9 KB (added by gongminmin@…, 9 years ago)
  • boost/boost/config/compiler/visualc.hpp

    diff -r 8a5f9c8b6fb3 boost/boost/config/compiler/visualc.hpp
    a b  
    276276#     define BOOST_COMPILER_VERSION evc10
    277277#   elif _MSC_VER < 1800
    278278#     define BOOST_COMPILER_VERSION evc11
     279#   elif _MSC_VER < 1900
     280#     define BOOST_COMPILER_VERSION evc12
    279281#   else
    280282#      if defined(BOOST_ASSERT_CONFIG)
    281283#         error "Unknown EVC++ compiler version - please run the configure tests and report the results"
     
    301303#     define BOOST_COMPILER_VERSION 10.0
    302304#   elif _MSC_VER < 1800
    303305#     define BOOST_COMPILER_VERSION 11.0
     306#   elif _MSC_VER < 1900
     307#     define BOOST_COMPILER_VERSION 12.0
    304308#   else
    305309#     define BOOST_COMPILER_VERSION _MSC_VER
    306310#   endif
     
    310314#endif
    311315
    312316//
    313 // last known and checked version is 1700 (VC11, aka 2011):
    314 #if (_MSC_VER > 1700)
     317// last known and checked version is 1800 (VC12, aka 2013):
     318#if (_MSC_VER > 1800)
    315319#  if defined(BOOST_ASSERT_CONFIG)
    316320#     error "Unknown compiler version - please run the configure tests and report the results"
    317321#  else
  • boost/tools/build/v2/tools/msvc.jam

    diff -r 8a5f9c8b6fb3 boost/tools/build/v2/tools/msvc.jam
    a b  
    738738            # version from the path.
    739739            # FIXME: We currently detect both Microsoft Visual Studio 9.0 and
    740740            # 9.0express as 9.0 here.
    741             if [ MATCH "(Microsoft Visual Studio 11)" : $(command) ]
     741            if [ MATCH "(Microsoft Visual Studio 12)" : $(command) ]
     742            {
     743                version = 12.0 ;
     744            }
     745            else if [ MATCH "(Microsoft Visual Studio 11)" : $(command) ]
    742746            {
    743747                version = 11.0 ;
    744748            }
     
    13641368
    13651369
    13661370# Known toolset versions, in order of preference.
    1367 .known-versions = 11.0 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;
     1371.known-versions = 12.0 11.0 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;
    13681372
    13691373# Version aliases.
    13701374.version-alias-6 = 6.0 ;
     
    13741378.version-alias-9 = 9.0 ;
    13751379.version-alias-10 = 10.0 ;
    13761380.version-alias-11 = 11.0 ;
     1381.version-alias-12 = 12.0 ;
    13771382
    13781383# Names of registry keys containing the Visual C++ installation path (relative
    13791384# to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft").
     
    13871392.version-10.0-reg = "VisualStudio\\10.0\\Setup\\VC" ;
    13881393.version-10.0express-reg = "VCExpress\\10.0\\Setup\\VC" ;
    13891394.version-11.0-reg = "VisualStudio\\11.0\\Setup\\VC" ;
     1395.version-12.0-reg = "VisualStudio\\12.0\\Setup\\VC" ;
    13901396
    13911397# Visual C++ Toolkit 2003 does not store its installation path in the registry.
    13921398# The environment variable 'VCToolkitInstallDir' and the default installation