diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-24 19:48:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-06-25 18:51:23 (GMT) |
| commit | bdc7d9c8d90ded163d1afd3e5d6c9a1135974b2c (patch) | |
| tree | 75262e7dd82f76611e5e8b87cf25b55e27973d33 | |
| parent | d96b3f68f422bc57541a912e6983fcab095f6426 (diff) | |
| download | CMake-bdc7d9c8d90ded163d1afd3e5d6c9a1135974b2c.zip CMake-bdc7d9c8d90ded163d1afd3e5d6c9a1135974b2c.tar.gz CMake-bdc7d9c8d90ded163d1afd3e5d6c9a1135974b2c.tar.bz2 | |
VS14: Fix Cl and Link flag tables as previous versions
Apply the flag table fixes from:
commit 9c7f234c (VS: Fix /MANIFESTUAC:NO linker option mapping, 2014-05-07)
commit e8633e66 (VS: Fix /analyze:log flag mapping, 2014-04-01)
commit f2caf795 (VS: Fix /MAP:mapfile flag mapping, 2013-07-09)
to the VS 14 flag tables.
| -rw-r--r-- | Source/cmVS14CLFlagTable.h | 9 | ||||
| -rw-r--r-- | Source/cmVS14LinkFlagTable.h | 7 |
2 files changed, 5 insertions, 11 deletions
diff --git a/Source/cmVS14CLFlagTable.h b/Source/cmVS14CLFlagTable.h index ed4c9c8..422f47b 100644 --- a/Source/cmVS14CLFlagTable.h +++ b/Source/cmVS14CLFlagTable.h @@ -256,9 +256,9 @@ static cmVS7FlagTable cmVS14CLFlagTable[] = {"ForcedUsingFiles", "FU", "Forced #using File", "", cmVS7FlagTable::UserValue | cmVS7FlagTable::SemicolonAppendable}, - {"PREfastAdditionalOptions", "analyze:", - "Additional Code Analysis Native options", - "", cmVS7FlagTable::UserValue | cmVS7FlagTable::SemicolonAppendable}, + {"PREfastLog", "analyze:log", + "Code Analysis Log", + "", cmVS7FlagTable::UserFollowing}, {"PREfastAdditionalPlugins", "analyze:plugin", "Additional Code Analysis Native plugins", "", cmVS7FlagTable::UserValue | cmVS7FlagTable::SemicolonAppendable}, @@ -291,9 +291,6 @@ static cmVS7FlagTable cmVS14CLFlagTable[] = "", cmVS7FlagTable::UserValue}, // Skip [XMLDocumentationFileName] - no command line Switch. // Skip [BrowseInformationFile] - no command line Switch. - {"PREfastLog", "analyze:log ", - "Code Analysis Log", - "", cmVS7FlagTable::UserValue}, // Skip [AdditionalOptions] - no command line Switch. {0,0,0,0,0} }; diff --git a/Source/cmVS14LinkFlagTable.h b/Source/cmVS14LinkFlagTable.h index cb55459..6d81d12 100644 --- a/Source/cmVS14LinkFlagTable.h +++ b/Source/cmVS14LinkFlagTable.h @@ -217,17 +217,14 @@ static cmVS7FlagTable cmVS14LinkFlagTable[] = {"LinkDLL", "DLL", "", "true", 0}, //Bool Properties With Argument - {"EnableUAC", "MANIFESTUAC:NO", "", "false", - cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, - {"EnableUAC", "MANIFESTUAC:NO", "Enable User Account Control (UAC)", "", - cmVS7FlagTable::UserValueRequired}, + {"EnableUAC", "MANIFESTUAC:NO", "", "false", 0}, {"EnableUAC", "MANIFESTUAC:", "", "true", cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, {"UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "", cmVS7FlagTable::UserValueRequired}, {"GenerateMapFile", "MAP", "", "true", cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, - {"MapFileName", "MAP", "Generate Map File", "", + {"MapFileName", "MAP:", "Generate Map File", "", cmVS7FlagTable::UserValueRequired}, //String List Properties |