summaryrefslogtreecommitdiffstats
path: root/Templates
diff options
context:
space:
mode:
authorBenjamin Sluis <benjamin.sluis@intel.com>2022-01-11 15:43:23 (GMT)
committerBrad King <brad.king@kitware.com>2022-01-12 21:45:07 (GMT)
commit9e24437c912f52a7afcba58cdd51b74c7dab3861 (patch)
tree9cbf329b1ee1f8e4f00f6179ec4f52254238fc04 /Templates
parentb8e0b40734568a9a18095babc3feb4b1fe12c6ef (diff)
downloadCMake-9e24437c912f52a7afcba58cdd51b74c7dab3861.zip
CMake-9e24437c912f52a7afcba58cdd51b74c7dab3861.tar.gz
CMake-9e24437c912f52a7afcba58cdd51b74c7dab3861.tar.bz2
VS: Remove the '/guard:cf' flag from v143 link flag table
Apply the change from commit db35e3cfd6 (VS: Fix support for '/guard:cf' linker flag for v142, 2019-01-24, v3.14.0-rc1~74^2~2) to the v143 flag table. The entry for `LinkControlFlowGuard` in `v143_Link.json` does not work when used in a `.vcxproj` file. Drop our link flag table entries for this toolset so that the flag will be passed via `AdditionalOptions`. Also add a test case.
Diffstat (limited to 'Templates')
-rw-r--r--Templates/MSBuild/FlagTables/v143_Link.json7
1 files changed, 0 insertions, 7 deletions
diff --git a/Templates/MSBuild/FlagTables/v143_Link.json b/Templates/MSBuild/FlagTables/v143_Link.json
index 71d58f8..4422f55 100644
--- a/Templates/MSBuild/FlagTables/v143_Link.json
+++ b/Templates/MSBuild/FlagTables/v143_Link.json
@@ -978,13 +978,6 @@
"flags": []
},
{
- "name": "LinkControlFlowGuard",
- "switch": "guard:cf",
- "comment": "Control Flow Guard",
- "value": "true",
- "flags": []
- },
- {
"name": "LinkGuardEHContMetadata",
"switch": "guard:ehcont",
"comment": "Enable EH Continuation Metadata",