diff options
| author | Brad King <brad.king@kitware.com> | 2018-12-07 13:37:03 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-12-07 13:37:14 (GMT) |
| commit | 99a224e3ee0b6a770c388313a7b32746a95514e8 (patch) | |
| tree | f6eacbd986d95959e8b49cf450253e8b30b6b33d /Source/cmGlobalVisualStudio14Generator.cxx | |
| parent | ce1ac9b92d23577f96abd4d750fc8499cc40d70f (diff) | |
| parent | 8107508b3e610cd2fbbcbf6111f125d39e16f74d (diff) | |
| download | CMake-99a224e3ee0b6a770c388313a7b32746a95514e8.zip CMake-99a224e3ee0b6a770c388313a7b32746a95514e8.tar.gz CMake-99a224e3ee0b6a770c388313a7b32746a95514e8.tar.bz2 | |
Merge topic 'vs-json-flag-table'
8107508b3e Remove old flag table headers
6d855fbf44 Replace header flag tables with json reading
9c60ae5f11 VS: Add flag table entry for -JMC
584ad067ba VS: Fix flag table entry for -Qspectre
8df25f9400 VS: connect /Y- compiler option with "Not Using Precompiled Headers"
f1223e34c6 VS: Add v140 flag table entries for `-Zc:inline[-]`
efc90eed77 VS: Fix regressed mapping for the cl `/Os` compiler flag
36b7fc7db6 VS 14: Add flag map for -std= to CppLanguageStandard tag in project files
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2611
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 92ee2e0..ac969e8 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; } |