1 files changed, 9 insertions, 5 deletions
diff --git a/Source/cmVS141LinkFlagTable.h b/Source/cmVS141LinkFlagTable.h
index 8f0f1f4..f159f70 100644
--- a/Source/cmVS141LinkFlagTable.h
+++ b/Source/cmVS141LinkFlagTable.h
@@ -29,6 +29,8 @@ static cmVS7FlagTable cmVS141LinkFlagTable[] = {
   { "CreateHotPatchableImage", "FUNCTIONPADMIN:16", "Itanium Image Only",
     "ItaniumImage", 0 },
 
+  // correct flags for uac should be /MANIFESTUAC, but some projects already
+  // use this bug to access uac field, so keep these for compatibility
   { "UACExecutionLevel", "level='asInvoker'", "asInvoker", "AsInvoker", 0 },
   { "UACExecutionLevel", "level='highestAvailable'", "highestAvailable",
     "HighestAvailable", 0 },
@@ -87,6 +89,7 @@ static cmVS7FlagTable cmVS141LinkFlagTable[] = {
 
   { "TargetMachine", "", "Not Set", "NotSet", 0 },
   { "TargetMachine", "MACHINE:ARM", "MachineARM", "MachineARM", 0 },
+  { "TargetMachine", "MACHINE:ARM64", "MachineARM64", "MachineARM64", 0 },
   { "TargetMachine", "MACHINE:EBC", "MachineEBC", "MachineEBC", 0 },
   { "TargetMachine", "MACHINE:IA64", "MachineIA64", "MachineIA64", 0 },
   { "TargetMachine", "MACHINE:MIPS", "MachineMIPS", "MachineMIPS", 0 },
@@ -149,8 +152,12 @@ static cmVS7FlagTable cmVS141LinkFlagTable[] = {
   { "GenerateManifest", "MANIFEST:NO", "", "false", 0 },
   { "GenerateManifest", "MANIFEST", "", "true", 0 },
   { "AllowIsolation", "ALLOWISOLATION:NO", "", "false", 0 },
+
+  // correct flags for uac should be /MANIFESTUAC, but some projects already
+  // use this bug to access uac field, so keep these for compatibility
   { "UACUIAccess", "uiAccess='false'", "", "false", 0 },
   { "UACUIAccess", "uiAccess='true'", "", "true", 0 },
+
   { "ManifestEmbed", "manifest:embed", "", "true", 0 },
   { "MapExports", "MAPINFO:EXPORTS", "", "true", 0 },
   { "AssemblyDebug", "ASSEMBLYDEBUG:DISABLE", "", "false", 0 },
@@ -191,11 +198,8 @@ static cmVS7FlagTable cmVS141LinkFlagTable[] = {
   { "LinkDLL", "DLL", "", "true", 0 },
 
   // Bool Properties With Argument
-  { "EnableUAC", "MANIFESTUAC:NO", "", "false", 0 },
-  { "EnableUAC", "MANIFESTUAC:", "", "true",
-    cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue },
-  { "UACUIAccess", "MANIFESTUAC:", "Enable User Account Control (UAC)", "",
-    cmVS7FlagTable::UserValueRequired },
+  { "EnableUAC", "MANIFESTUAC:", "", "",
+    cmVS7FlagTable::UserValueRequired | cmVS7FlagTable::SpaceAppendable },
   { "GenerateMapFile", "MAP", "", "true",
     cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue },
   { "MapFileName", "MAP:", "Generate Map File", "",