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

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.
This commit is contained in:
Eric Berge 2014-05-07 13:56:12 -05:00 committed by Brad King
parent 9cb4677509
commit 9c7f234ceb
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmVS10LinkFlagTable.h
View File

@ -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)", "",

5
Source/cmVS11LinkFlagTable.h
View File

@ -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)", "",

5
Source/cmVS12LinkFlagTable.h
View File

@ -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)", "",