diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-01 13:27:33 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-01 13:27:33 (GMT) |
| commit | 8a08ab051a4162539356bdcbc5e7900a84c5816a (patch) | |
| tree | c48515a753d710a3b65e7d4e53e7f0e218b63221 /Tests/Preprocess | |
| parent | 526f1e636ef206f91d04f070f1598cc1c9746e6f (diff) | |
| parent | 9a76d83f6d567516fcfd63ce778072ab4d5c766a (diff) | |
| download | CMake-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 'Tests/Preprocess')
| -rw-r--r-- | Tests/Preprocess/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Tests/Preprocess/CMakeLists.txt b/Tests/Preprocess/CMakeLists.txt index fed9163..bc92a94 100644 --- a/Tests/Preprocess/CMakeLists.txt +++ b/Tests/Preprocess/CMakeLists.txt @@ -40,6 +40,9 @@ endif() if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 11") set(PP_VS110 1) endif() +if("${CMAKE_GENERATOR}" MATCHES "Visual Studio 12") + set(PP_VS120 1) +endif() # Some tests below check the PP_* variables set above. They are meant # to test the case that the build tool is at fault. Other tests below |