kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Brad King 2014-06-24 15:48:54 -04:00
parent d96b3f68f4
commit bdc7d9c8d9
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmVS14CLFlagTable.h
View File

@ -256,9 +256,9 @@ static cmVS7FlagTable cmVS14CLFlagTable[] =
{"ForcedUsingFiles", "FU", {"ForcedUsingFiles", "FU",
"Forced #using File", "Forced #using File",
"", cmVS7FlagTable::UserValue | cmVS7FlagTable::SemicolonAppendable}, "", cmVS7FlagTable::UserValue | cmVS7FlagTable::SemicolonAppendable},
{"PREfastAdditionalOptions", "analyze:", {"PREfastLog", "analyze:log",
"Additional Code Analysis Native options", "Code Analysis Log",
"", cmVS7FlagTable::UserValue | cmVS7FlagTable::SemicolonAppendable}, "", cmVS7FlagTable::UserFollowing},
{"PREfastAdditionalPlugins", "analyze:plugin", {"PREfastAdditionalPlugins", "analyze:plugin",
"Additional Code Analysis Native plugins", "Additional Code Analysis Native plugins",
"", cmVS7FlagTable::UserValue | cmVS7FlagTable::SemicolonAppendable}, "", cmVS7FlagTable::UserValue | cmVS7FlagTable::SemicolonAppendable},
@ -291,9 +291,6 @@ static cmVS7FlagTable cmVS14CLFlagTable[] =
"", cmVS7FlagTable::UserValue}, "", cmVS7FlagTable::UserValue},
// Skip [XMLDocumentationFileName] - no command line Switch. // Skip [XMLDocumentationFileName] - no command line Switch.
// Skip [BrowseInformationFile] - no command line Switch. // Skip [BrowseInformationFile] - no command line Switch.
{"PREfastLog", "analyze:log ",
"Code Analysis Log",
"", cmVS7FlagTable::UserValue},
// Skip [AdditionalOptions] - no command line Switch. // Skip [AdditionalOptions] - no command line Switch.
{0,0,0,0,0} {0,0,0,0,0}
}; };

7
Source/cmVS14LinkFlagTable.h
View File

@ -217,17 +217,14 @@ static cmVS7FlagTable cmVS14LinkFlagTable[] =
{"LinkDLL", "DLL", "", "true", 0}, {"LinkDLL", "DLL", "", "true", 0},
//Bool Properties With Argument //Bool Properties With Argument
{"EnableUAC", "MANIFESTUAC:NO", "", "false", {"EnableUAC", "MANIFESTUAC:NO", "", "false", 0},
cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
{"EnableUAC", "MANIFESTUAC:NO", "Enable User Account Control (UAC)", "",
cmVS7FlagTable::UserValueRequired},
{"EnableUAC", "MANIFESTUAC:", "", "true", {"EnableUAC", "MANIFESTUAC:", "", "true",
cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
{"UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "", {"UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "",
cmVS7FlagTable::UserValueRequired}, cmVS7FlagTable::UserValueRequired},
{"GenerateMapFile", "MAP", "", "true", {"GenerateMapFile", "MAP", "", "true",
cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue},
{"MapFileName", "MAP", "Generate Map File", "", {"MapFileName", "MAP:", "Generate Map File", "",
cmVS7FlagTable::UserValueRequired}, cmVS7FlagTable::UserValueRequired},
//String List Properties //String List Properties