diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-09 12:06:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-09 12:06:07 (GMT) |
| commit | 5e26887c35be116a83ba049098f5780309ced073 (patch) | |
| tree | 8d09b8677fc752348e1ab776029499c827e04da6 | |
| parent | fee0619e7c7e01324813ad447872b2da90f2f9e6 (diff) | |
| parent | a9f992434d3a75f262d261d6a8a5a111a757d5bd (diff) | |
| download | CMake-5e26887c35be116a83ba049098f5780309ced073.zip CMake-5e26887c35be116a83ba049098f5780309ced073.tar.gz CMake-5e26887c35be116a83ba049098f5780309ced073.tar.bz2 | |
Merge topic 'msvc-link-merge-fix'
a9f992434d VS: Remove the /MERGE flag from FlagTables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6205
| -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", |