diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-28 13:07:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-28 13:07:28 (GMT) |
| commit | ce57bc8e04e1b30dd2645df111783a8961296070 (patch) | |
| tree | 42831938397c980135b1a9f77ad97e09292586b2 /Source/cmGlobalVisualStudioVersionedGenerator.cxx | |
| parent | 70fabb8f25b41b2cf332335bb14f3627c786626f (diff) | |
| parent | 626c51f47be79c5438cc349f51ba1b4973194bfc (diff) | |
| download | CMake-ce57bc8e04e1b30dd2645df111783a8961296070.zip CMake-ce57bc8e04e1b30dd2645df111783a8961296070.tar.gz CMake-ce57bc8e04e1b30dd2645df111783a8961296070.tar.bz2 | |
Merge topic 'vs2019'
626c51f47b VS: Update for Visual Studio 2019 Preview 2
fd45cbf40e VS: Fix `/MANIFESTUAC:` link flag mapping for v142
db35e3cfd6 VS: Fix support for '/guard:cf' linker flag for v142
533f95c847 VS: Map the link `/debug` flag for v142
d2fcc6748a VS: Fix `/MANIFESTUAC:NO` link flag mapping for v142
a7973ccb53 VS: Populate `/permissive` flag table entry for v142
049410c0b6 VS: Populate `/JMC-` flag table entry for v142
43aa632f57 VS: Populate `-Qspectre-` flag table entry for v142
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2856
Diffstat (limited to 'Source/cmGlobalVisualStudioVersionedGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudioVersionedGenerator.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudioVersionedGenerator.cxx b/Source/cmGlobalVisualStudioVersionedGenerator.cxx index 31f585c..a83cc78 100644 --- a/Source/cmGlobalVisualStudioVersionedGenerator.cxx +++ b/Source/cmGlobalVisualStudioVersionedGenerator.cxx @@ -72,8 +72,7 @@ static const char* VSVersionToToolset( case cmGlobalVisualStudioGenerator::VS15: return "v141"; case cmGlobalVisualStudioGenerator::VS16: - // FIXME: VS 2019 Preview 1.1 uses v141 but preview 2 will use v142. - return "v141"; + return "v142"; } return ""; } |