summaryrefslogtreecommitdiffstats
path: root/Templates
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-24 18:01:30 (GMT)
committerBrad King <brad.king@kitware.com>2019-01-24 18:19:53 (GMT)
commitd2fcc6748aa2a7888fc1d0d8366f19141c2cf2c0 (patch)
tree25d396ba6cf07c0f9fb9eb56a0999de8feaea236 /Templates
parenta7973ccb5310b24acdc9176555b458bad6000a43 (diff)
downloadCMake-d2fcc6748aa2a7888fc1d0d8366f19141c2cf2c0.zip
CMake-d2fcc6748aa2a7888fc1d0d8366f19141c2cf2c0.tar.gz
CMake-d2fcc6748aa2a7888fc1d0d8366f19141c2cf2c0.tar.bz2
VS: Fix `/MANIFESTUAC:NO` link flag mapping for v142
Apply the change from commit 1d00fd7702 (VS: Fix /MANIFESTUAC:NO linker option mapping, 2018-11-21) to the v142 flag table. 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.
Diffstat (limited to 'Templates')
-rw-r--r--Templates/MSBuild/FlagTables/v142_Link.json6
1 files changed, 1 insertions, 5 deletions
diff --git a/Templates/MSBuild/FlagTables/v142_Link.json b/Templates/MSBuild/FlagTables/v142_Link.json
index acdb5ac..481468e 100644
--- a/Templates/MSBuild/FlagTables/v142_Link.json
+++ b/Templates/MSBuild/FlagTables/v142_Link.json
@@ -648,11 +648,7 @@
"switch": "MANIFESTUAC:NO",
"comment": "Enable User Account Control (UAC)",
"value": "false",
- "flags": [
- "UserValue",
- "UserIgnored",
- "Continue"
- ]
+ "flags": []
},
{
"name": "EnableUAC",