diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-11 15:18:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-11 15:18:41 (GMT) |
| commit | 881bca249defc148bc98d3caa9799f34536dd256 (patch) | |
| tree | 30b5ee75861053b247d5f3e94c617aa2e4192c42 /Source | |
| parent | dec3e9363e2ced84ef4c3a3972272c27d90a8766 (diff) | |
| parent | bbf216fb6bc85ab0db994655026ce5c934473aea (diff) | |
| download | CMake-881bca249defc148bc98d3caa9799f34536dd256.zip CMake-881bca249defc148bc98d3caa9799f34536dd256.tar.gz CMake-881bca249defc148bc98d3caa9799f34536dd256.tar.bz2 | |
Merge branch 'vs-v142-csharp-flags' into release-3.15
Merge-request: !3908
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10ToolsetOptions.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10ToolsetOptions.cxx b/Source/cmVisualStudio10ToolsetOptions.cxx index a490e03..7fc33e6 100644 --- a/Source/cmVisualStudio10ToolsetOptions.cxx +++ b/Source/cmVisualStudio10ToolsetOptions.cxx @@ -34,8 +34,7 @@ std::string cmVisualStudio10ToolsetOptions::GetCSharpFlagTableName( std::string const useToolset = this->GetToolsetName(name, toolset); if (useToolset == "v142") { - // FIXME: Add CSharp flag table for v142. - return "v141"; + return "v142"; } else if (useToolset == "v141") { return "v141"; } else if (useToolset == "v140") { |