Ticket #5922: msvc11-build.patch

File msvc11-build.patch, 1.7 KB (added by Matthew Bradbury <matt-bradbury@…>, 11 years ago)

Patch to autodetect MSVC11

  • tools/build/v2/tools/msvc.jam

     
    736736            # version from the path.
    737737            # FIXME: We currently detect both Microsoft Visual Studio 9.0 and
    738738            # 9.0express as 9.0 here.
    739             if [ MATCH "(Microsoft Visual Studio 10)" : $(command) ]
     739            if [ MATCH "(Microsoft Visual Studio 11)" : $(command) ]
    740740            {
     741                version = 11.0 ;
     742            }
     743            else if [ MATCH "(Microsoft Visual Studio 10)" : $(command) ]
     744            {
    741745                version = 10.0 ;
    742746            }
    743747            else if [ MATCH "(Microsoft Visual Studio 9)" : $(command) ]
     
    13511355
    13521356
    13531357# Known toolset versions, in order of preference.
    1354 .known-versions = 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;
     1358.known-versions = 11.0 10.0 10.0express 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;
    13551359
    13561360# Version aliases.
    13571361.version-alias-6 = 6.0 ;
     
    13601364.version-alias-8 = 8.0 ;
    13611365.version-alias-9 = 9.0 ;
    13621366.version-alias-10 = 10.0 ;
     1367.version-alias-11 = 11.0 ;
    13631368
    13641369# Names of registry keys containing the Visual C++ installation path (relative
    13651370# to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft").
     
    13721377.version-9.0express-reg = "VCExpress\\9.0\\Setup\\VC" ;
    13731378.version-10.0-reg = "VisualStudio\\10.0\\Setup\\VC" ;
    13741379.version-10.0express-reg = "VCExpress\\10.0\\Setup\\VC" ;
     1380.version-11.0-reg = "VisualStudio\\11.0\\Setup\\VC" ;
    13751381
    13761382# Visual C++ Toolkit 2003 does not store its installation path in the registry.
    13771383# The environment variable 'VCToolkitInstallDir' and the default installation