summaryrefslogtreecommitdiffstats
path: root/Templates
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-01-24 18:11:14 (GMT)
committerBrad King <brad.king@kitware.com>2019-01-24 18:19:55 (GMT)
commitdb35e3cfd606a156cbb518af19603da7f22c26d8 (patch)
tree278a391b84d947c187102f4db58e34e7b4aebb78 /Templates
parent533f95c8479c6c04ec23263244671bd81a98ea39 (diff)
downloadCMake-db35e3cfd606a156cbb518af19603da7f22c26d8.zip
CMake-db35e3cfd606a156cbb518af19603da7f22c26d8.tar.gz
CMake-db35e3cfd606a156cbb518af19603da7f22c26d8.tar.bz2
VS: Fix support for '/guard:cf' linker flag for v142
Apply the change from commit 57a78b5526 (VS: Fix support for '/guard:cf' linker flag, 2018-11-21) to the v142 flag table. Although `$(VCTargetsPath)/1033/link.xml` contains an entry for `LinkControlFlowGuard`, it does not work when used in a `.vcxproj` file (at least as of v140 and v141). Drop our link flag table entries for these toolsets so that the flag will be passed via `AdditionalOptions`.
Diffstat (limited to 'Templates')
-rw-r--r--Templates/MSBuild/FlagTables/v142_Link.json7
1 files changed, 0 insertions, 7 deletions
diff --git a/Templates/MSBuild/FlagTables/v142_Link.json b/Templates/MSBuild/FlagTables/v142_Link.json
index c4fd8e3..d5144c8 100644
--- a/Templates/MSBuild/FlagTables/v142_Link.json
+++ b/Templates/MSBuild/FlagTables/v142_Link.json
@@ -547,13 +547,6 @@
"flags": []
},
{
- "name": "LinkControlFlowGuard",
- "switch": "guard:cf",
- "comment": "Enable Security Check with Guard",
- "value": "Guard",
- "flags": []
- },
- {
"name": "LinkIncremental",
"switch": "INCREMENTAL:NO",
"comment": "Enable Incremental Linking",