diff options
| author | Duncan Ogilvie <mr.exodia.tpodt@gmail.com> | 2021-06-08 19:58:42 (GMT) |
|---|---|---|
| committer | Duncan Ogilvie <mr.exodia.tpodt@gmail.com> | 2021-06-08 21:23:38 (GMT) |
| commit | a9f992434d3a75f262d261d6a8a5a111a757d5bd (patch) | |
| tree | 847bd8c0c2038ac07eb7a7cf9818e014ee3ea47b /Templates | |
| parent | c63ad0c2d1ee657a65585d0d0ea61279ca0db4d7 (diff) | |
| download | CMake-a9f992434d3a75f262d261d6a8a5a111a757d5bd.zip CMake-a9f992434d3a75f262d261d6a8a5a111a757d5bd.tar.gz CMake-a9f992434d3a75f262d261d6a8a5a111a757d5bd.tar.bz2 | |
VS: Remove the /MERGE flag from FlagTables
Fixes #22229
Diffstat (limited to 'Templates')
| -rw-r--r-- | Templates/MSBuild/FlagTables/v10_Link.json | 9 | ||||
| -rw-r--r-- | Templates/MSBuild/FlagTables/v11_Link.json | 9 | ||||
| -rw-r--r-- | Templates/MSBuild/FlagTables/v12_Link.json | 9 | ||||
| -rw-r--r-- | Templates/MSBuild/FlagTables/v140_Link.json | 9 | ||||
| -rw-r--r-- | Templates/MSBuild/FlagTables/v141_Link.json | 9 | ||||
| -rw-r--r-- | Templates/MSBuild/FlagTables/v142_Link.json | 9 |
6 files changed, 0 insertions, 54 deletions
diff --git a/Templates/MSBuild/FlagTables/v10_Link.json b/Templates/MSBuild/FlagTables/v10_Link.json index ac5b8b1..494774b 100644 --- a/Templates/MSBuild/FlagTables/v10_Link.json +++ b/Templates/MSBuild/FlagTables/v10_Link.json @@ -1090,15 +1090,6 @@ ] }, { - "name": "MergeSections", - "switch": "MERGE:", - "comment": "Merge Sections", - "value": "", - "flags": [ - "UserValue" - ] - }, - { "name": "LinkKeyFile", "switch": "KEYFILE:", "comment": "Key File", diff --git a/Templates/MSBuild/FlagTables/v11_Link.json b/Templates/MSBuild/FlagTables/v11_Link.json index 5d5c13f..0db5d9e 100644 --- a/Templates/MSBuild/FlagTables/v11_Link.json +++ b/Templates/MSBuild/FlagTables/v11_Link.json @@ -1225,15 +1225,6 @@ ] }, { - "name": "MergeSections", - "switch": "MERGE:", - "comment": "Merge Sections", - "value": "", - "flags": [ - "UserValue" - ] - }, - { "name": "LinkKeyFile", "switch": "KEYFILE:", "comment": "Key File", diff --git a/Templates/MSBuild/FlagTables/v12_Link.json b/Templates/MSBuild/FlagTables/v12_Link.json index 5d5c13f..0db5d9e 100644 --- a/Templates/MSBuild/FlagTables/v12_Link.json +++ b/Templates/MSBuild/FlagTables/v12_Link.json @@ -1225,15 +1225,6 @@ ] }, { - "name": "MergeSections", - "switch": "MERGE:", - "comment": "Merge Sections", - "value": "", - "flags": [ - "UserValue" - ] - }, - { "name": "LinkKeyFile", "switch": "KEYFILE:", "comment": "Key File", diff --git a/Templates/MSBuild/FlagTables/v140_Link.json b/Templates/MSBuild/FlagTables/v140_Link.json index 3fb072c..7e293b1 100644 --- a/Templates/MSBuild/FlagTables/v140_Link.json +++ b/Templates/MSBuild/FlagTables/v140_Link.json @@ -1269,15 +1269,6 @@ ] }, { - "name": "MergeSections", - "switch": "MERGE:", - "comment": "Merge Sections", - "value": "", - "flags": [ - "UserValue" - ] - }, - { "name": "LinkKeyFile", "switch": "KEYFILE:", "comment": "Key File", diff --git a/Templates/MSBuild/FlagTables/v141_Link.json b/Templates/MSBuild/FlagTables/v141_Link.json index 66ee76f..e311240 100644 --- a/Templates/MSBuild/FlagTables/v141_Link.json +++ b/Templates/MSBuild/FlagTables/v141_Link.json @@ -1276,15 +1276,6 @@ ] }, { - "name": "MergeSections", - "switch": "MERGE:", - "comment": "Merge Sections", - "value": "", - "flags": [ - "UserValue" - ] - }, - { "name": "LinkKeyFile", "switch": "KEYFILE:", "comment": "Key File", diff --git a/Templates/MSBuild/FlagTables/v142_Link.json b/Templates/MSBuild/FlagTables/v142_Link.json index 110dcc2..d5fc2e4 100644 --- a/Templates/MSBuild/FlagTables/v142_Link.json +++ b/Templates/MSBuild/FlagTables/v142_Link.json @@ -1283,15 +1283,6 @@ ] }, { - "name": "MergeSections", - "switch": "MERGE:", - "comment": "Merge Sections", - "value": "", - "flags": [ - "UserValue" - ] - }, - { "name": "LinkKeyFile", "switch": "KEYFILE:", "comment": "Key File", |