diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-07 15:35:32 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-05-07 15:35:32 -0400 |
| commit | 890efcb6077d01629ca29f9f54c90a1f0663033a (patch) | |
| tree | 3a0242752c8e653dd2a41cc96bdb1f121ee6b9b0 | |
| parent | 74dc1a0be6b93fe84a0c218761e1911c9b314ab2 (diff) | |
| parent | 9c7f234ceb9a74e2d79e653cbeaece9bfc6211fd (diff) | |
| download | cmake-890efcb6077d01629ca29f9f54c90a1f0663033a.tar.gz | |
Merge branch 'vs-fix-MANIFESTUAC' into release
| -rw-r--r-- | Source/cmVS10LinkFlagTable.h | 5 | ||||
| -rw-r--r-- | Source/cmVS11LinkFlagTable.h | 5 | ||||
| -rw-r--r-- | Source/cmVS12LinkFlagTable.h | 5 |
3 files changed, 3 insertions, 12 deletions
diff --git a/Source/cmVS10LinkFlagTable.h b/Source/cmVS10LinkFlagTable.h index 5d1562002d..f6b758d05f 100644 --- a/Source/cmVS10LinkFlagTable.h +++ b/Source/cmVS10LinkFlagTable.h @@ -191,10 +191,7 @@ static cmVS7FlagTable cmVS10LinkFlagTable[] = {"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)", "", diff --git a/Source/cmVS11LinkFlagTable.h b/Source/cmVS11LinkFlagTable.h index b4587a8362..0f641e40e0 100644 --- a/Source/cmVS11LinkFlagTable.h +++ b/Source/cmVS11LinkFlagTable.h @@ -217,10 +217,7 @@ static cmVS7FlagTable cmVS11LinkFlagTable[] = {"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)", "", diff --git a/Source/cmVS12LinkFlagTable.h b/Source/cmVS12LinkFlagTable.h index 73d450a9de..e5a570e7c0 100644 --- a/Source/cmVS12LinkFlagTable.h +++ b/Source/cmVS12LinkFlagTable.h @@ -217,10 +217,7 @@ static cmVS7FlagTable cmVS12LinkFlagTable[] = {"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)", "", |