Commit 20860031 authored by Brad King's avatar Brad King
Browse files

Merge branch 'vs-link-guard-cf' into release-3.9

parents d3234a8a 82a5c2c6
......@@ -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 },
......
......@@ -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 },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment