diff options
| author | Stephan Szabo <stephan.szabo@sony.com> | 2018-11-21 12:49:03 -0800 |
|---|---|---|
| committer | Stephan Szabo <stephan.szabo@sony.com> | 2018-11-28 07:43:28 -0800 |
| commit | 1d00fd7702d9cf9c1f2d7a1c17bc9a80f345c39b (patch) | |
| tree | 34d9c04981bfb41205239a3b661169b334533d8e /Templates | |
| parent | 3133fa50948d3f2369a9e5b598ff6537ff7506df (diff) | |
| download | cmake-1d00fd7702d9cf9c1f2d7a1c17bc9a80f345c39b.tar.gz | |
VS: Fix /MANIFESTUAC:NO linker option mapping
Original header commits:
v10/v11/v12 commit v3.0.0-rc5~3^2
v140 commit v3.1.0-rc1~358^2~3
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/v10_Link.json | 6 | ||||
| -rw-r--r-- | Templates/MSBuild/FlagTables/v11_Link.json | 6 | ||||
| -rw-r--r-- | Templates/MSBuild/FlagTables/v12_Link.json | 6 | ||||
| -rw-r--r-- | Templates/MSBuild/FlagTables/v140_Link.json | 6 | ||||
| -rw-r--r-- | Templates/MSBuild/FlagTables/v141_Link.json | 6 |
5 files changed, 5 insertions, 25 deletions
diff --git a/Templates/MSBuild/FlagTables/v10_Link.json b/Templates/MSBuild/FlagTables/v10_Link.json index b4f6d9f21f..dd0723476e 100644 --- a/Templates/MSBuild/FlagTables/v10_Link.json +++ b/Templates/MSBuild/FlagTables/v10_Link.json @@ -536,11 +536,7 @@ "switch": "MANIFESTUAC:NO", "comment": "Enable User Account Control (UAC)", "value": "false", - "flags": [ - "UserValue", - "UserIgnored", - "Continue" - ] + "flags": [] }, { "name": "EnableUAC", diff --git a/Templates/MSBuild/FlagTables/v11_Link.json b/Templates/MSBuild/FlagTables/v11_Link.json index 6829abb47f..858526cedf 100644 --- a/Templates/MSBuild/FlagTables/v11_Link.json +++ b/Templates/MSBuild/FlagTables/v11_Link.json @@ -599,11 +599,7 @@ "switch": "MANIFESTUAC:NO", "comment": "Enable User Account Control (UAC)", "value": "false", - "flags": [ - "UserValue", - "UserIgnored", - "Continue" - ] + "flags": [] }, { "name": "EnableUAC", diff --git a/Templates/MSBuild/FlagTables/v12_Link.json b/Templates/MSBuild/FlagTables/v12_Link.json index 6829abb47f..858526cedf 100644 --- a/Templates/MSBuild/FlagTables/v12_Link.json +++ b/Templates/MSBuild/FlagTables/v12_Link.json @@ -599,11 +599,7 @@ "switch": "MANIFESTUAC:NO", "comment": "Enable User Account Control (UAC)", "value": "false", - "flags": [ - "UserValue", - "UserIgnored", - "Continue" - ] + "flags": [] }, { "name": "EnableUAC", diff --git a/Templates/MSBuild/FlagTables/v140_Link.json b/Templates/MSBuild/FlagTables/v140_Link.json index 7ccc41b7df..134f907532 100644 --- a/Templates/MSBuild/FlagTables/v140_Link.json +++ b/Templates/MSBuild/FlagTables/v140_Link.json @@ -634,11 +634,7 @@ "switch": "MANIFESTUAC:NO", "comment": "Enable User Account Control (UAC)", "value": "false", - "flags": [ - "UserValue", - "UserIgnored", - "Continue" - ] + "flags": [] }, { "name": "EnableUAC", diff --git a/Templates/MSBuild/FlagTables/v141_Link.json b/Templates/MSBuild/FlagTables/v141_Link.json index acdb5ac1c0..481468edb8 100644 --- a/Templates/MSBuild/FlagTables/v141_Link.json +++ b/Templates/MSBuild/FlagTables/v141_Link.json @@ -648,11 +648,7 @@ "switch": "MANIFESTUAC:NO", "comment": "Enable User Account Control (UAC)", "value": "false", - "flags": [ - "UserValue", - "UserIgnored", - "Continue" - ] + "flags": [] }, { "name": "EnableUAC", |