diff options
| author | Stephan Szabo <stephan.szabo@sony.com> | 2018-11-28 15:32:14 (GMT) |
|---|---|---|
| committer | Stephan Szabo <stephan.szabo@sony.com> | 2018-11-28 15:43:31 (GMT) |
| commit | 6d855fbf442d1ab3b209ac9b46f97ad8e567df41 (patch) | |
| tree | d62e45c60810f43f0d86a7c6e6635165969e759e /Source/cmGlobalVisualStudio14Generator.cxx | |
| parent | 9c60ae5f1105d6d793f2693630bf09abb7d66935 (diff) | |
| download | CMake-6d855fbf442d1ab3b209ac9b46f97ad8e567df41.zip CMake-6d855fbf442d1ab3b209ac9b46f97ad8e567df41.tar.gz CMake-6d855fbf442d1ab3b209ac9b46f97ad8e567df41.tar.bz2 | |
Replace header flag tables with json reading
Stop loading flag tables from header files and instead load the flag table
information from json files in Templates/MSBuild/FlagTables.
Diffstat (limited to 'Source/cmGlobalVisualStudio14Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio14Generator.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index c3ddb3e..9647f78 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -6,12 +6,6 @@ #include "cmDocumentationEntry.h" #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" -#include "cmVS140CLFlagTable.h" -#include "cmVS140CSharpFlagTable.h" -#include "cmVS140LinkFlagTable.h" -#include "cmVS14LibFlagTable.h" -#include "cmVS14MASMFlagTable.h" -#include "cmVS14RCFlagTable.h" static const char vs14generatorName[] = "Visual Studio 14 2015"; @@ -90,12 +84,12 @@ cmGlobalVisualStudio14Generator::cmGlobalVisualStudio14Generator( "ProductDir", vc14Express, cmSystemTools::KeyWOW64_32); this->DefaultPlatformToolset = "v140"; - this->DefaultClFlagTable = cmVS140CLFlagTable; - this->DefaultCSharpFlagTable = cmVS140CSharpFlagTable; - this->DefaultLibFlagTable = cmVS14LibFlagTable; - this->DefaultLinkFlagTable = cmVS140LinkFlagTable; - this->DefaultMasmFlagTable = cmVS14MASMFlagTable; - this->DefaultRcFlagTable = cmVS14RCFlagTable; + this->DefaultCLFlagTableName = "v140"; + this->DefaultCSharpFlagTableName = "v140"; + this->DefaultLibFlagTableName = "v14"; + this->DefaultLinkFlagTableName = "v140"; + this->DefaultMasmFlagTableName = "v14"; + this->DefaultRCFlagTableName = "v14"; this->Version = VS14; } |