summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-10-11 10:42:47 -0400
committerBrad King <brad.king@kitware.com>2019-10-11 11:11:20 -0400
commitbbf216fb6bc85ab0db994655026ce5c934473aea (patch)
tree327fb2ac032d0bfdbeb24f7ff6eeddf2d8f242e9 /Source
parent6fb747a01c27a2226fe4cbf77bc19e6d21286f81 (diff)
downloadcmake-bbf216fb6bc85ab0db994655026ce5c934473aea.tar.gz
VS: Add toolset v142 CSharp flag table
While the flag tables for C and C++ were generated from MSBuild `.xml` files, the CSharp flag tables were written by hand. Copy the `v141` flag table to use for the `v142` toolset. Remove the special case added by commit 626c51f47b (VS: Update for Visual Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) that mapped the v142 flag table lookup to v141 since we now have the real v142 table. Fixes: #19828
Diffstat (limited to 'Source')
-rw-r--r--Source/cmVisualStudio10ToolsetOptions.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10ToolsetOptions.cxx b/Source/cmVisualStudio10ToolsetOptions.cxx
index a490e03df2..7fc33e63ea 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") {