diff options
| author | Brad King <brad.king@kitware.com> | 2017-07-05 14:11:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-07-05 14:11:21 (GMT) |
| commit | f973d49ab9d4c59b93f6dac812a94bb130200836 (patch) | |
| tree | c611a7be744db61103aaa9a316568880a93301b0 /Source | |
| parent | a57b3537504c055dbd72673816a672982cc3592d (diff) | |
| parent | 82a5c2c6a56af5e51c5ec8ac30fda5e145087489 (diff) | |
| download | CMake-f973d49ab9d4c59b93f6dac812a94bb130200836.zip CMake-f973d49ab9d4c59b93f6dac812a94bb130200836.tar.gz CMake-f973d49ab9d4c59b93f6dac812a94bb130200836.tar.bz2 | |
Merge topic 'vs-link-guard-cf'
82a5c2c6 VS: Fix support for '/guard:cf' linker flag
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1018
Diffstat (limited to 'Source')
| -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 }, |