summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudioGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-07-01 13:27:33 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-07-01 13:27:33 (GMT)
commit8a08ab051a4162539356bdcbc5e7900a84c5816a (patch)
treec48515a753d710a3b65e7d4e53e7f0e218b63221 /Source/cmLocalVisualStudioGenerator.h
parent526f1e636ef206f91d04f070f1598cc1c9746e6f (diff)
parent9a76d83f6d567516fcfd63ce778072ab4d5c766a (diff)
downloadCMake-8a08ab051a4162539356bdcbc5e7900a84c5816a.zip
CMake-8a08ab051a4162539356bdcbc5e7900a84c5816a.tar.gz
CMake-8a08ab051a4162539356bdcbc5e7900a84c5816a.tar.bz2
Merge topic 'vs12-generator'
9a76d83 VS12: Find proper MSBuild for VSProjectInSubdir test 4e5cb39 Merge branch 'master' into vs12-generator 78fdbbc FindBoost: Add -vc120 mangling for VS 12 e99d7b1 VS12: Generate flag tables from MSBuild v120 tool files 77ac9b8 VS12: Add Visual Studio 12 generator (#14251)
Diffstat (limited to 'Source/cmLocalVisualStudioGenerator.h')
-rw-r--r--Source/cmLocalVisualStudioGenerator.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmLocalVisualStudioGenerator.h b/Source/cmLocalVisualStudioGenerator.h
index 9968592..1a3499a 100644
--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@@ -38,7 +38,8 @@ public:
VS8 = 80,
VS9 = 90,
VS10 = 100,
- VS11 = 110
+ VS11 = 110,
+ VS12 = 120
};
cmLocalVisualStudioGenerator(VSVersion v);