diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-24 16:19:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-01-24 18:49:25 (GMT) |
| commit | 626c51f47be79c5438cc349f51ba1b4973194bfc (patch) | |
| tree | 2b7a43b80a1cede0c6caa59e6221d08b0efcc775 /Source/cmVisualStudio10ToolsetOptions.cxx | |
| parent | fd45cbf40ee809d6b900f22247fef06e3d349c78 (diff) | |
| download | CMake-626c51f47be79c5438cc349f51ba1b4973194bfc.zip CMake-626c51f47be79c5438cc349f51ba1b4973194bfc.tar.gz CMake-626c51f47be79c5438cc349f51ba1b4973194bfc.tar.bz2 | |
VS: Update for Visual Studio 2019 Preview 2
The toolset is now called `v142`. Use matching flag tables.
Fixes: #18834
Diffstat (limited to 'Source/cmVisualStudio10ToolsetOptions.cxx')
| -rw-r--r-- | Source/cmVisualStudio10ToolsetOptions.cxx | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Source/cmVisualStudio10ToolsetOptions.cxx b/Source/cmVisualStudio10ToolsetOptions.cxx index 39063ed..a490e03 100644 --- a/Source/cmVisualStudio10ToolsetOptions.cxx +++ b/Source/cmVisualStudio10ToolsetOptions.cxx @@ -11,7 +11,9 @@ std::string cmVisualStudio10ToolsetOptions::GetClFlagTableName( { std::string const useToolset = this->GetToolsetName(name, toolset); - if (toolset == "v141") { + if (toolset == "v142") { + return "v142"; + } else if (toolset == "v141") { return "v141"; } else if (useToolset == "v140") { return "v140"; @@ -31,7 +33,10 @@ std::string cmVisualStudio10ToolsetOptions::GetCSharpFlagTableName( { std::string const useToolset = this->GetToolsetName(name, toolset); - if ((useToolset == "v141")) { + if (useToolset == "v142") { + // FIXME: Add CSharp flag table for v142. + return "v141"; + } else if (useToolset == "v141") { return "v141"; } else if (useToolset == "v140") { return "v140"; @@ -51,7 +56,8 @@ std::string cmVisualStudio10ToolsetOptions::GetRcFlagTableName( { std::string const useToolset = this->GetToolsetName(name, toolset); - if ((useToolset == "v140") || (useToolset == "v141")) { + if ((useToolset == "v140") || (useToolset == "v141") || + (useToolset == "v142")) { return "v14"; } else if (useToolset == "v120") { return "v12"; @@ -69,7 +75,8 @@ std::string cmVisualStudio10ToolsetOptions::GetLibFlagTableName( { std::string const useToolset = this->GetToolsetName(name, toolset); - if ((useToolset == "v140") || (useToolset == "v141")) { + if ((useToolset == "v140") || (useToolset == "v141") || + (useToolset == "v142")) { return "v14"; } else if (useToolset == "v120") { return "v12"; @@ -87,7 +94,9 @@ std::string cmVisualStudio10ToolsetOptions::GetLinkFlagTableName( { std::string const useToolset = this->GetToolsetName(name, toolset); - if (useToolset == "v141") { + if (useToolset == "v142") { + return "v142"; + } else if (useToolset == "v141") { return "v141"; } else if (useToolset == "v140") { return "v140"; @@ -107,7 +116,8 @@ std::string cmVisualStudio10ToolsetOptions::GetMasmFlagTableName( { std::string const useToolset = this->GetToolsetName(name, toolset); - if ((useToolset == "v140") || (useToolset == "v141")) { + if ((useToolset == "v140") || (useToolset == "v141") || + (useToolset == "v142")) { return "v14"; } else if (useToolset == "v120") { return "v12"; |