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/cmGlobalVisualStudio15Generator.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/cmGlobalVisualStudio15Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio15Generator.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx index 23fd2d5..2853283 100644 --- a/Source/cmGlobalVisualStudio15Generator.cxx +++ b/Source/cmGlobalVisualStudio15Generator.cxx @@ -6,9 +6,6 @@ #include "cmDocumentationEntry.h" #include "cmLocalVisualStudio10Generator.h" #include "cmMakefile.h" -#include "cmVS141CLFlagTable.h" -#include "cmVS141CSharpFlagTable.h" -#include "cmVS141LinkFlagTable.h" #include "cmVSSetupHelper.h" static const char vs15generatorName[] = "Visual Studio 15 2017"; @@ -84,9 +81,9 @@ cmGlobalVisualStudio15Generator::cmGlobalVisualStudio15Generator( { this->ExpressEdition = false; this->DefaultPlatformToolset = "v141"; - this->DefaultClFlagTable = cmVS141CLFlagTable; - this->DefaultCSharpFlagTable = cmVS141CSharpFlagTable; - this->DefaultLinkFlagTable = cmVS141LinkFlagTable; + this->DefaultCLFlagTableName = "v141"; + this->DefaultCSharpFlagTableName = "v141"; + this->DefaultLinkFlagTableName = "v141"; this->Version = VS15; } |