summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-24 18:15:49 (GMT)
committerBrad King <brad.king@kitware.com>2019-01-24 18:19:57 (GMT)
commitfd45cbf40ee809d6b900f22247fef06e3d349c78 (patch)
treedc20039df9e8322d3830b31c5eb7b8bf7a691350
parentdb35e3cfd606a156cbb518af19603da7f22c26d8 (diff)
downloadCMake-fd45cbf40ee809d6b900f22247fef06e3d349c78.zip
CMake-fd45cbf40ee809d6b900f22247fef06e3d349c78.tar.gz
CMake-fd45cbf40ee809d6b900f22247fef06e3d349c78.tar.bz2
VS: Fix `/MANIFESTUAC:` link flag mapping for v142
Apply the change from commit 454b47ba0b (VS: Fix MANIFESTUAC link flag map to .vcxproj elements, 2018-11-21) to the v142 flag table. Add special parsing of the flags given in `/MANIFESTUAC:"..."` in order to map them correctly to `.vcxproj` elements. Keep the old incorrect flag table entries for `uiAccess` and `level` flags for compatibility even though they do not really exist.
-rw-r--r--Templates/MSBuild/FlagTables/v142_Link.json25
1 files changed, 4 insertions, 21 deletions
diff --git a/Templates/MSBuild/FlagTables/v142_Link.json b/Templates/MSBuild/FlagTables/v142_Link.json
index d5144c8..66ee76f 100644
--- a/Templates/MSBuild/FlagTables/v142_Link.json
+++ b/Templates/MSBuild/FlagTables/v142_Link.json
@@ -646,20 +646,13 @@
},
{
"name": "EnableUAC",
- "switch": "MANIFESTUAC:NO",
- "comment": "Enable User Account Control (UAC)",
- "value": "false",
- "flags": []
- },
- {
- "name": "EnableUAC",
"switch": "MANIFESTUAC:",
- "comment": "Enable User Account Control (UAC)",
- "value": "true",
+ "comment": "",
+ "value": "",
"flags": [
"UserValue",
- "UserIgnored",
- "Continue"
+ "UserRequired",
+ "SpaceAppendable"
]
},
{
@@ -674,16 +667,6 @@
},
{
"name": "UACUIAccess",
- "switch": "MANIFESTUAC:",
- "comment": "UAC Bypass UI Protection",
- "value": "true",
- "flags": [
- "UserValue",
- "UserRequired"
- ]
- },
- {
- "name": "UACUIAccess",
"switch": "uiAccess='false'",
"comment": "UAC Bypass UI Protection",
"value": "false",