diff options
author | Brad King <brad.king@kitware.com> | 2016-09-02 20:14:20 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-09-06 14:22:39 (GMT) |
commit | a8936656faa14b27173f90046fef6259dceaa321 (patch) | |
tree | 662b1423e5cb7c48835858226914a9675e4758b8 /Source/cmVS14LinkFlagTable.h | |
parent | 21346d3f12f6ec35680574df44430c7bfb2efecb (diff) | |
download | CMake-a8936656faa14b27173f90046fef6259dceaa321.zip CMake-a8936656faa14b27173f90046fef6259dceaa321.tar.gz CMake-a8936656faa14b27173f90046fef6259dceaa321.tar.bz2 |
VS: Update v140 flag tables from VS 15 MSBuild files
Run cmparseMSBuildXML.py on cl.xml, lib.xml, link.xml, and masm.xml to
generate our flag tables:
python cmparseMSBuildXML.py -x ".../Common7/IDE/VC/VCTargets/1033/cl.xml" > cmVS14CLFlagTable.h
python cmparseMSBuildXML.py -x ".../Common7/IDE/VC/VCTargets/1033/lib.xml" > cmVS14LibFlagTable.h
python cmparseMSBuildXML.py -x ".../Common7/IDE/VC/VCTargets/1033/link.xml" > cmVS14LinkFlagTable.h
python cmparseMSBuildXML.py -x ".../Common7/IDE/VC/VCTargets/BuildCustomizations/masm.xml" > cmVS14MASMFlagTable.h
Manually integrate the changes with those we've made since earlier
import to add the new flag mappings.
Diffstat (limited to 'Source/cmVS14LinkFlagTable.h')
-rw-r--r-- | Source/cmVS14LinkFlagTable.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Source/cmVS14LinkFlagTable.h b/Source/cmVS14LinkFlagTable.h index 6e56422..596f880 100644 --- a/Source/cmVS14LinkFlagTable.h +++ b/Source/cmVS14LinkFlagTable.h @@ -35,6 +35,12 @@ static cmVS7FlagTable cmVS14LinkFlagTable[] = { { "UACExecutionLevel", "level='requireAdministrator'", "requireAdministrator", "RequireAdministrator", 0 }, + { "GenerateDebugInformation", "DEBUG:FASTLINK", + "Optimize for faster linking", "DebugFastLink", + cmVS7FlagTable::CaseInsensitive }, + { "GenerateDebugInformation", "DEBUG", "Optimize for debugging", "Debug", + cmVS7FlagTable::CaseInsensitive }, + { "SubSystem", "", "Not Set", "NotSet", 0 }, { "SubSystem", "SUBSYSTEM:CONSOLE", "Console", "Console", 0 }, { "SubSystem", "SUBSYSTEM:WINDOWS", "Windows", "Windows", 0 }, @@ -54,6 +60,8 @@ static cmVS7FlagTable cmVS14LinkFlagTable[] = { { "Driver", "DRIVER:WDM", "WDM", "WDM", 0 }, { "LinkTimeCodeGeneration", "", "Default", "Default", 0 }, + { "LinkTimeCodeGeneration", "LTCG:incremental", + "Use Fast Link Time Code Generation", "UseFastLinkTimeCodeGeneration", 0 }, { "LinkTimeCodeGeneration", "LTCG", "Use Link Time Code Generation", "UseLinkTimeCodeGeneration", 0 }, { "LinkTimeCodeGeneration", "LTCG:PGInstrument", @@ -121,6 +129,9 @@ static cmVS7FlagTable cmVS14LinkFlagTable[] = { { "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 }, @@ -138,10 +149,6 @@ static cmVS7FlagTable cmVS14LinkFlagTable[] = { { "UACUIAccess", "uiAccess='false'", "", "false", 0 }, { "UACUIAccess", "uiAccess='true'", "", "true", 0 }, { "ManifestEmbed", "manifest:embed", "", "true", 0 }, - { "GenerateDebugInformation", "DEBUG:FASTLINK", "", "DebugFastLink", - cmVS7FlagTable::CaseInsensitive }, - { "GenerateDebugInformation", "DEBUG", "", "Debug", - cmVS7FlagTable::CaseInsensitive }, { "MapExports", "MAPINFO:EXPORTS", "", "true", 0 }, { "AssemblyDebug", "ASSEMBLYDEBUG:DISABLE", "", "false", 0 }, { "AssemblyDebug", "ASSEMBLYDEBUG", "", "true", 0 }, @@ -195,6 +202,8 @@ static cmVS7FlagTable cmVS14LinkFlagTable[] = { { "AdditionalLibraryDirectories", "LIBPATH:", "Additional Library Directories", "", cmVS7FlagTable::UserValue | cmVS7FlagTable::SemicolonAppendable }, + { "Natvis", "NATVIS:", "Natvis files", "", + cmVS7FlagTable::UserValue | cmVS7FlagTable::SemicolonAppendable }, // Skip [AdditionalDependencies] - no command line Switch. { "IgnoreSpecificDefaultLibraries", "NODEFAULTLIB:", "Ignore Specific Default Libraries", "", |