diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-12 14:22:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-12 14:22:21 (GMT) |
| commit | b727e74fb0c6bd05a0e03ab08a5d38fac906c5e1 (patch) | |
| tree | 269d94020537de011a6487e938c8b3330c1fc4e8 /Source | |
| parent | a8d42ecb8dddc615e93559889994390bd10daf88 (diff) | |
| parent | bbf216fb6bc85ab0db994655026ce5c934473aea (diff) | |
| download | CMake-b727e74fb0c6bd05a0e03ab08a5d38fac906c5e1.zip CMake-b727e74fb0c6bd05a0e03ab08a5d38fac906c5e1.tar.gz CMake-b727e74fb0c6bd05a0e03ab08a5d38fac906c5e1.tar.bz2 | |
Merge topic 'vs-v142-csharp-flags'
bbf216fb6b VS: Add toolset v142 CSharp flag table
Acked-by: Kitware Robot <kwrobot@kitware.com>
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") { |