Ticket #3069: msvc.jam.patch
File msvc.jam.patch, 1.8 KB (added by , 13 years ago) |
---|
-
msvc.jam
677 677 # version from the path. 678 678 # FIXME: We currently detect both Microsoft Visual Studio 9.0 and 679 679 # 9.0express as 9.0 here. 680 if [ MATCH "(Microsoft Visual Studio 9)" : $(command) ]680 if [ MATCH "(Microsoft Visual Studio 10)" : $(command) ] 681 681 { 682 version = 10.0 ; 683 } 684 else if [ MATCH "(Microsoft Visual Studio 9)" : $(command) ] 685 { 682 686 version = 9.0 ; 683 687 } 684 if [ MATCH "(Microsoft Visual Studio 8)" : $(command) ]688 else if [ MATCH "(Microsoft Visual Studio 8)" : $(command) ] 685 689 { 686 690 version = 8.0 ; 687 691 } … … 1266 1270 1267 1271 1268 1272 # Known toolset versions, in order of preference. 1269 .known-versions = 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ;1273 .known-versions = 10.0 9.0 9.0express 8.0 8.0express 7.1 7.1toolkit 7.0 6.0 ; 1270 1274 1271 1275 # Version aliases. 1272 1276 .version-alias-6 = 6.0 ; … … 1274 1278 .version-alias-7 = 7.0 ; 1275 1279 .version-alias-8 = 8.0 ; 1276 1280 .version-alias-9 = 9.0 ; 1281 .version-alias-10 = 10.0 ; 1277 1282 1278 1283 # Names of registry keys containing the Visual C++ installation path (relative 1279 1284 # to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft"). … … 1284 1289 .version-8.0express-reg = "VCExpress\\8.0\\Setup\\VC" ; 1285 1290 .version-9.0-reg = "VisualStudio\\9.0\\Setup\\VC" ; 1286 1291 .version-9.0express-reg = "VCExpress\\9.0\\Setup\\VC" ; 1292 .version-10.0-reg = "VisualStudio\\10.0\\Setup\\VC" ; 1287 1293 1288 1294 # Visual C++ Toolkit 2003 does not store its installation path in the registry. 1289 1295 # The environment variable 'VCToolkitInstallDir' and the default installation