summaryrefslogtreecommitdiffstats
path: root/Templates
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-07-14 17:34:15 (GMT)
committerBrad King <brad.king@kitware.com>2021-07-15 17:12:54 (GMT)
commitb933584a7210ac5d81397981589267efa8a9b582 (patch)
tree39f4e96faba213186585e824ed6b7eea459de3a9 /Templates
parentd3175a6079655a07174810ba5f6d344702cd6c09 (diff)
downloadCMake-b933584a7210ac5d81397981589267efa8a9b582.zip
CMake-b933584a7210ac5d81397981589267efa8a9b582.tar.gz
CMake-b933584a7210ac5d81397981589267efa8a9b582.tar.bz2
VS: Remove the /MERGE flag from v143 link flag table
Apply the change from commit a9f992434d (VS: Remove the /MERGE flag from FlagTables, 2021-06-08, v3.21.0-rc1~58^2) to the v143 flag table.
Diffstat (limited to 'Templates')
-rw-r--r--Templates/MSBuild/FlagTables/v143_Link.json9
1 files changed, 0 insertions, 9 deletions
diff --git a/Templates/MSBuild/FlagTables/v143_Link.json b/Templates/MSBuild/FlagTables/v143_Link.json
index c52d01e..71d58f8 100644
--- a/Templates/MSBuild/FlagTables/v143_Link.json
+++ b/Templates/MSBuild/FlagTables/v143_Link.json
@@ -1351,15 +1351,6 @@
]
},
{
- "name": "MergeSections",
- "switch": "MERGE:",
- "comment": "Merge Sections",
- "value": "",
- "flags": [
- "UserValue"
- ]
- },
- {
"name": "LinkKeyFile",
"switch": "KEYFILE:",
"comment": "Key File",