Commit 9c7f234c authored by Eric Berge's avatar Eric Berge Committed by Brad King
Browse files

VS: Fix /MANIFESTUAC:NO linker option mapping

There are no versions of /MANIFESTUAC:NO where addition values are
appended.  Remove both of the MANIFESTUAC:NO entries from our flag
tables and replace them with one which would set EnableUAC to false and
immediately stop processing the /MANIFESTUAC:NO option.
parent 9cb46775
...@@ -191,10 +191,7 @@ static cmVS7FlagTable cmVS10LinkFlagTable[] = ...@@ -191,10 +191,7 @@ static cmVS7FlagTable cmVS10LinkFlagTable[] =
{"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)", "",
......
...@@ -217,10 +217,7 @@ static cmVS7FlagTable cmVS11LinkFlagTable[] = ...@@ -217,10 +217,7 @@ static cmVS7FlagTable cmVS11LinkFlagTable[] =
{"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)", "",
......
...@@ -217,10 +217,7 @@ static cmVS7FlagTable cmVS12LinkFlagTable[] = ...@@ -217,10 +217,7 @@ static cmVS7FlagTable cmVS12LinkFlagTable[] =
{"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)", "",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment