diff -r 8a5f9c8b6fb3 boost/boost/config/compiler/visualc.hpp
a
|
b
|
|
276 | 276 | # define BOOST_COMPILER_VERSION evc10 |
277 | 277 | # elif _MSC_VER < 1800 |
278 | 278 | # define BOOST_COMPILER_VERSION evc11 |
| 279 | # elif _MSC_VER < 1900 |
| 280 | # define BOOST_COMPILER_VERSION evc12 |
279 | 281 | # else |
280 | 282 | # if defined(BOOST_ASSERT_CONFIG) |
281 | 283 | # error "Unknown EVC++ compiler version - please run the configure tests and report the results" |
… |
… |
|
301 | 303 | # define BOOST_COMPILER_VERSION 10.0 |
302 | 304 | # elif _MSC_VER < 1800 |
303 | 305 | # define BOOST_COMPILER_VERSION 11.0 |
| 306 | # elif _MSC_VER < 1900 |
| 307 | # define BOOST_COMPILER_VERSION 12.0 |
304 | 308 | # else |
305 | 309 | # define BOOST_COMPILER_VERSION _MSC_VER |
306 | 310 | # endif |
… |
… |
|
310 | 314 | #endif |
311 | 315 | |
312 | 316 | // |
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) |
315 | 319 | # if defined(BOOST_ASSERT_CONFIG) |
316 | 320 | # error "Unknown compiler version - please run the configure tests and report the results" |
317 | 321 | # else |
diff -r 8a5f9c8b6fb3 boost/tools/build/v2/tools/msvc.jam
a
|
b
|
|
738 | 738 | # version from the path. |
739 | 739 | # FIXME: We currently detect both Microsoft Visual Studio 9.0 and |
740 | 740 | # 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) ] |
742 | 746 | { |
743 | 747 | version = 11.0 ; |
744 | 748 | } |
… |
… |
|
1364 | 1368 | |
1365 | 1369 | |
1366 | 1370 | # 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 ; |
1368 | 1372 | |
1369 | 1373 | # Version aliases. |
1370 | 1374 | .version-alias-6 = 6.0 ; |
… |
… |
|
1374 | 1378 | .version-alias-9 = 9.0 ; |
1375 | 1379 | .version-alias-10 = 10.0 ; |
1376 | 1380 | .version-alias-11 = 11.0 ; |
| 1381 | .version-alias-12 = 12.0 ; |
1377 | 1382 | |
1378 | 1383 | # Names of registry keys containing the Visual C++ installation path (relative |
1379 | 1384 | # to "HKEY_LOCAL_MACHINE\SOFTWARE\\Microsoft"). |
… |
… |
|
1387 | 1392 | .version-10.0-reg = "VisualStudio\\10.0\\Setup\\VC" ; |
1388 | 1393 | .version-10.0express-reg = "VCExpress\\10.0\\Setup\\VC" ; |
1389 | 1394 | .version-11.0-reg = "VisualStudio\\11.0\\Setup\\VC" ; |
| 1395 | .version-12.0-reg = "VisualStudio\\12.0\\Setup\\VC" ; |
1390 | 1396 | |
1391 | 1397 | # Visual C++ Toolkit 2003 does not store its installation path in the registry. |
1392 | 1398 | # The environment variable 'VCToolkitInstallDir' and the default installation |