diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-30 14:57:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-06-30 14:57:55 (GMT) |
| commit | 2086003145b92b2f7b7d364aa0bba69c55997b73 (patch) | |
| tree | 90220894aedff452350f3f67dbf6210db3c9c04b | |
| parent | d3234a8a48bbb24eff6bb1a0b1750d18c3417792 (diff) | |
| parent | 82a5c2c6a56af5e51c5ec8ac30fda5e145087489 (diff) | |
| download | CMake-2086003145b92b2f7b7d364aa0bba69c55997b73.zip CMake-2086003145b92b2f7b7d364aa0bba69c55997b73.tar.gz CMake-2086003145b92b2f7b7d364aa0bba69c55997b73.tar.bz2 | |
Merge branch 'vs-link-guard-cf' into release-3.9
| -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 }, |