diff options
| author | Brad King <brad.king@kitware.com> | 2009-10-23 18:59:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-10-23 18:59:26 (GMT) |
| commit | 8ae66bf456e1496113c576595639c111baee6471 (patch) | |
| tree | 441742c06d19fe9a9930be6ea9741f2038a659ee /Source/cmVS10LinkFlagTable.h | |
| parent | 5484550af63946292c96baba472b7a959f0dfb9d (diff) | |
| download | CMake-8ae66bf456e1496113c576595639c111baee6471.zip CMake-8ae66bf456e1496113c576595639c111baee6471.tar.gz CMake-8ae66bf456e1496113c576595639c111baee6471.tar.bz2 | |
Fix optionally-valued booleans in VS 10 flag table
This commit fixes the cmparseMSBuildXML.py script to generate correct
flag table entries for booleans with optional value. These flags use
two entries: the first should ignore the value and enable the option,
and the second should use the value if given. Previously the first
entry did not recognize flags with values.
In particular this fixes flags like /MP4, but the change corrects
matching of some other flags too. See issue #9771.
Diffstat (limited to 'Source/cmVS10LinkFlagTable.h')
| -rw-r--r-- | Source/cmVS10LinkFlagTable.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmVS10LinkFlagTable.h b/Source/cmVS10LinkFlagTable.h index c1f1dda..c60e8eb 100644 --- a/Source/cmVS10LinkFlagTable.h +++ b/Source/cmVS10LinkFlagTable.h @@ -191,13 +191,16 @@ static cmVS7FlagTable cmVS10LinkFlagTable[] = {"LinkDLL", "DLL", "", "true", 0}, //Bool Properties With Argument - {"EnableUAC", "MANIFESTUAC:NO", "", "false", cmVS7FlagTable::Continue}, + {"EnableUAC", "MANIFESTUAC:NO", "", "false", + cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, {"EnableUAC", "MANIFESTUAC:NO", "Enable User Account Control (UAC)", "", cmVS7FlagTable::UserValueRequired}, - {"EnableUAC", "MANIFESTUAC:", "", "true", cmVS7FlagTable::Continue}, + {"EnableUAC", "MANIFESTUAC:", "", "true", + cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, {"UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "", cmVS7FlagTable::UserValueRequired}, - {"GenerateMapFile", "MAP", "", "true", cmVS7FlagTable::Continue}, + {"GenerateMapFile", "MAP", "", "true", + cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue}, {"MapFileName", "MAP", "Generate Map File", "", cmVS7FlagTable::UserValueRequired}, |