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/cmGlobalVisualStudio11Generator.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/cmGlobalVisualStudio11Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio11Generator.cxx | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx index f1d5a8c..e40023d 100644 --- a/Source/cmGlobalVisualStudio11Generator.cxx +++ b/Source/cmGlobalVisualStudio11Generator.cxx @@ -6,12 +6,6 @@ #include "cmDocumentationEntry.h" #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" -#include "cmVS11CLFlagTable.h" -#include "cmVS11CSharpFlagTable.h" -#include "cmVS11LibFlagTable.h" -#include "cmVS11LinkFlagTable.h" -#include "cmVS11MASMFlagTable.h" -#include "cmVS11RCFlagTable.h" static const char vs11generatorName[] = "Visual Studio 11 2012"; @@ -107,12 +101,12 @@ cmGlobalVisualStudio11Generator::cmGlobalVisualStudio11Generator( "ProductDir", vc11Express, cmSystemTools::KeyWOW64_32); this->DefaultPlatformToolset = "v110"; - this->DefaultClFlagTable = cmVS11CLFlagTable; - this->DefaultCSharpFlagTable = cmVS11CSharpFlagTable; - this->DefaultLibFlagTable = cmVS11LibFlagTable; - this->DefaultLinkFlagTable = cmVS11LinkFlagTable; - this->DefaultMasmFlagTable = cmVS11MASMFlagTable; - this->DefaultRcFlagTable = cmVS11RCFlagTable; + this->DefaultCLFlagTableName = "v11"; + this->DefaultCSharpFlagTableName = "v11"; + this->DefaultLibFlagTableName = "v11"; + this->DefaultLinkFlagTableName = "v11"; + this->DefaultMasmFlagTableName = "v11"; + this->DefaultRCFlagTableName = "v11"; this->Version = VS11; } |