diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-13 12:25:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-13 12:25:52 (GMT) |
| commit | 3b07c58dbdb7fb02b7a61ea4bc3ea78d1bdbea9c (patch) | |
| tree | fc3c1899f5260800c770b29de80b6aa043802401 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 0123500309d293103c79ba7485b46152bbe6afbb (diff) | |
| parent | b1d67ae8a5a1334bfeaf802c55d517d8eaa0dbf9 (diff) | |
| download | CMake-3b07c58dbdb7fb02b7a61ea4bc3ea78d1bdbea9c.zip CMake-3b07c58dbdb7fb02b7a61ea4bc3ea78d1bdbea9c.tar.gz CMake-3b07c58dbdb7fb02b7a61ea4bc3ea78d1bdbea9c.tar.bz2 | |
Merge topic 'vs15-separate-flag-table'
b1d67ae8 VS: Split flag table between v140 and v141 toolsets
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 6690bfa..82f4b99 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -25,7 +25,8 @@ #include "cmVS12LinkFlagTable.h" #include "cmVS12MASMFlagTable.h" #include "cmVS12RCFlagTable.h" -#include "cmVS14CLFlagTable.h" +#include "cmVS140CLFlagTable.h" +#include "cmVS141CLFlagTable.h" #include "cmVS14LibFlagTable.h" #include "cmVS14LinkFlagTable.h" #include "cmVS14MASMFlagTable.h" @@ -43,7 +44,13 @@ cmIDEFlagTable const* cmVisualStudio10TargetGenerator::GetClFlagTable() const cmGlobalVisualStudioGenerator::VSVersion v = this->LocalGenerator->GetVersion(); if (v >= cmGlobalVisualStudioGenerator::VS14) { - return cmVS14CLFlagTable; + // FIXME: All flag table selection should be based on the toolset name. + // See issue #16153. For now, treat VS 15's toolset as a special case. + const char* toolset = this->GlobalGenerator->GetPlatformToolset(); + if (toolset && cmHasLiteralPrefix(toolset, "v141")) { + return cmVS141CLFlagTable; + } + return cmVS140CLFlagTable; } else if (v >= cmGlobalVisualStudioGenerator::VS12) { return cmVS12CLFlagTable; } else if (v == cmGlobalVisualStudioGenerator::VS11) { |