diff options
| author | Don Olmstead <don.j.olmstead@gmail.com> | 2016-10-18 00:50:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-25 13:19:49 (GMT) |
| commit | e2ed9a70929092ab7b32e036886859e53fbff897 (patch) | |
| tree | 8da37a4d6ab2242391b943421a2080f8db02f8e9 /Source/cmGlobalVisualStudio14Generator.cxx | |
| parent | 584ab5285b51945e0dd523caf77342985ac97ce4 (diff) | |
| download | CMake-e2ed9a70929092ab7b32e036886859e53fbff897.zip CMake-e2ed9a70929092ab7b32e036886859e53fbff897.tar.gz CMake-e2ed9a70929092ab7b32e036886859e53fbff897.tar.bz2 | |
VS: Move toolset flag table lookup to global generator
Move `Get*FlagTable` methods to the global generator and have each VS
generator version pre-populate its default flag table.
Diffstat (limited to 'Source/cmGlobalVisualStudio14Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio14Generator.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index 586fe3c..e0b86d7 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -5,6 +5,11 @@ #include "cmAlgorithms.h" #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" +#include "cmVS140CLFlagTable.h" +#include "cmVS14LibFlagTable.h" +#include "cmVS14LinkFlagTable.h" +#include "cmVS14MASMFlagTable.h" +#include "cmVS14RCFlagTable.h" static const char vs14generatorName[] = "Visual Studio 14 2015"; @@ -83,6 +88,11 @@ cmGlobalVisualStudio14Generator::cmGlobalVisualStudio14Generator( "ProductDir", vc14Express, cmSystemTools::KeyWOW64_32); this->DefaultPlatformToolset = "v140"; + this->DefaultClFlagTable = cmVS140CLFlagTable; + this->DefaultLibFlagTable = cmVS14LibFlagTable; + this->DefaultLinkFlagTable = cmVS14LinkFlagTable; + this->DefaultMasmFlagTable = cmVS14MASMFlagTable; + this->DefaultRcFlagTable = cmVS14RCFlagTable; this->Version = VS14; } |