diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-11 15:19:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-11 15:19:02 (GMT) |
| commit | 820f9523169bf3de75b2042c241457d8f7a73d74 (patch) | |
| tree | 5d852aef1b07ccfe27ec60ec5eabdde3d4661bce /Source | |
| parent | d26ef5d807917ddaafac83c50d251379d822d060 (diff) | |
| parent | bbf216fb6bc85ab0db994655026ce5c934473aea (diff) | |
| download | CMake-820f9523169bf3de75b2042c241457d8f7a73d74.zip CMake-820f9523169bf3de75b2042c241457d8f7a73d74.tar.gz CMake-820f9523169bf3de75b2042c241457d8f7a73d74.tar.bz2 | |
Merge branch 'vs-v142-csharp-flags' into release-3.16
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") { |