diff options
| author | Olender, Sebastian D <sebastian.d.olender@intel.com> | 2017-06-30 14:06:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-30 14:57:40 (GMT) |
| commit | 82a5c2c6a56af5e51c5ec8ac30fda5e145087489 (patch) | |
| tree | 78b8b9408b6d742a2f98313f5d8d59192f696398 | |
| parent | 594b0f80a8e943f9c2a0920b56f3c69b0553b92a (diff) | |
| download | CMake-82a5c2c6a56af5e51c5ec8ac30fda5e145087489.zip CMake-82a5c2c6a56af5e51c5ec8ac30fda5e145087489.tar.gz CMake-82a5c2c6a56af5e51c5ec8ac30fda5e145087489.tar.bz2 | |
VS: Fix support for '/guard:cf' linker flag
Although `$(VCTargetsPath)/1033/link.xml` for v140 and v141 toolsets
contains an entry for `LinkControlFlowGuard`, it does not work when used
in a `.vcxproj` file. Drop our link flag table entries for these
toolsets so that the flag will be passed via `AdditionalOptions`.
| -rw-r--r-- | Source/cmVS140LinkFlagTable.h | 3 | ||||
| -rw-r--r-- | Source/cmVS141LinkFlagTable.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Source/cmVS140LinkFlagTable.h b/Source/cmVS140LinkFlagTable.h index ceb1d78..b9a4dc3 100644 --- a/Source/cmVS140LinkFlagTable.h +++ b/Source/cmVS140LinkFlagTable.h @@ -134,9 +134,6 @@ static cmVS7FlagTable cmVS140LinkFlagTable[] = { { "CLRSupportLastError", "CLRSupportLastError:SYSTEMDLL", "System Dlls Only", "SystemDlls", 0 }, - { "LinkControlFlowGuard", "guard:cf", "Enable Security Check with Guard", - "Guard", 0 }, - // Bool Properties { "LinkIncremental", "INCREMENTAL:NO", "", "false", 0 }, { "LinkIncremental", "INCREMENTAL", "", "true", 0 }, diff --git a/Source/cmVS141LinkFlagTable.h b/Source/cmVS141LinkFlagTable.h index d7faf81..8f0f1f4 100644 --- a/Source/cmVS141LinkFlagTable.h +++ b/Source/cmVS141LinkFlagTable.h @@ -135,9 +135,6 @@ static cmVS7FlagTable cmVS141LinkFlagTable[] = { { "CLRSupportLastError", "CLRSupportLastError:SYSTEMDLL", "System Dlls Only", "SystemDlls", 0 }, - { "LinkControlFlowGuard", "guard:cf", "Enable Security Check with Guard", - "Guard", 0 }, - // Bool Properties { "LinkIncremental", "INCREMENTAL:NO", "", "false", 0 }, { "LinkIncremental", "INCREMENTAL", "", "true", 0 }, |