diff options
| author | Ian Hojnicki <nullref@live.com> | 2017-06-22 21:37:05 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-28 12:55:40 (GMT) |
| commit | 17a397c22a7c7f14aa001f85f64c36428c71414a (patch) | |
| tree | 5cf4f53d78b616f872109e42e070651994e2ff68 /Source/cmVisualStudio10ToolsetOptions.cxx | |
| parent | 372de3f8039f69b3a2edcf7120083ec4097f8bd3 (diff) | |
| download | CMake-17a397c22a7c7f14aa001f85f64c36428c71414a.zip CMake-17a397c22a7c7f14aa001f85f64c36428c71414a.tar.gz CMake-17a397c22a7c7f14aa001f85f64c36428c71414a.tar.bz2 | |
VS: Split link flag table between v140 and v141 toolsets
Diffstat (limited to 'Source/cmVisualStudio10ToolsetOptions.cxx')
| -rw-r--r-- | Source/cmVisualStudio10ToolsetOptions.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmVisualStudio10ToolsetOptions.cxx b/Source/cmVisualStudio10ToolsetOptions.cxx index afca216..9a1d950 100644 --- a/Source/cmVisualStudio10ToolsetOptions.cxx +++ b/Source/cmVisualStudio10ToolsetOptions.cxx @@ -26,10 +26,11 @@ #include "cmVS12RCFlagTable.h" #include "cmVS140CLFlagTable.h" #include "cmVS140CSharpFlagTable.h" +#include "cmVS140LinkFlagTable.h" #include "cmVS141CLFlagTable.h" #include "cmVS141CSharpFlagTable.h" +#include "cmVS141LinkFlagTable.h" #include "cmVS14LibFlagTable.h" -#include "cmVS14LinkFlagTable.h" #include "cmVS14MASMFlagTable.h" #include "cmVS14RCFlagTable.h" @@ -114,8 +115,10 @@ cmIDEFlagTable const* cmVisualStudio10ToolsetOptions::GetLinkFlagTable( { std::string const useToolset = this->GetToolsetName(name, toolset); - if ((useToolset == "v140") || (useToolset == "v141")) { - return cmVS14LinkFlagTable; + if (useToolset == "v141") { + return cmVS141LinkFlagTable; + } else if (useToolset == "v140") { + return cmVS140LinkFlagTable; } else if (useToolset == "v120") { return cmVS12LinkFlagTable; } else if (useToolset == "v110") { |