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/cmVS14CLFlagTable.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/cmVS14CLFlagTable.h')
| -rw-r--r-- | Source/cmVS14CLFlagTable.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/cmVS14CLFlagTable.h b/Source/cmVS14CLFlagTable.h index 5812e79..c48db68 100644 --- a/Source/cmVS14CLFlagTable.h +++ b/Source/cmVS14CLFlagTable.h @@ -60,6 +60,9 @@ static cmVS7FlagTable cmVS14CLFlagTable[] = { { "BufferSecurityCheck", "GS-", "Disable Security Check", "false", 0 }, { "BufferSecurityCheck", "GS", "Enable Security Check", "true", 0 }, + { "ControlFlowGuard", "guard:cf", "Yes", "Guard", 0 }, + { "ControlFlowGuard", "", "No", "false", 0 }, + { "EnableEnhancedInstructionSet", "arch:SSE", "Streaming SIMD Extensions", "StreamingSIMDExtensions", 0 }, { "EnableEnhancedInstructionSet", "arch:SSE2", "Streaming SIMD Extensions 2", @@ -76,6 +79,10 @@ static cmVS7FlagTable cmVS14CLFlagTable[] = { { "FloatingPointModel", "fp:strict", "Strict", "Strict", 0 }, { "FloatingPointModel", "fp:fast", "Fast", "Fast", 0 }, + { "LanguageStandard", "std:c++14", "ISO C++14 Standard", "stdcpp14", 0 }, + { "LanguageStandard", "std:c++latest", "ISO C++ Latest Draft Standard", + "stdcpplatest", 0 }, + { "PrecompiledHeader", "Yc", "Create", "Create", cmVS7FlagTable::UserValueIgnored | cmVS7FlagTable::Continue }, { "PrecompiledHeader", "Yu", "Use", "Use", @@ -164,6 +171,9 @@ static cmVS7FlagTable cmVS14CLFlagTable[] = { { "TreatWChar_tAsBuiltInType", "Zc:wchar_t", "", "true", 0 }, { "ForceConformanceInForLoopScope", "Zc:forScope-", "", "false", 0 }, { "ForceConformanceInForLoopScope", "Zc:forScope", "", "true", 0 }, + { "RemoveUnreferencedCodeData", "Zc:inline", "", "true", 0 }, + { "EnforceTypeConversionRules", "Zc:rvalueCast-", "", "false", 0 }, + { "EnforceTypeConversionRules", "Zc:rvalueCast", "", "true", 0 }, { "RuntimeTypeInfo", "GR-", "", "false", 0 }, { "RuntimeTypeInfo", "GR", "", "true", 0 }, { "OpenMPSupport", "openmp-", "", "false", 0 }, @@ -215,6 +225,8 @@ static cmVS7FlagTable cmVS14CLFlagTable[] = { "", cmVS7FlagTable::UserValue | cmVS7FlagTable::SemicolonAppendable }, // String Properties + { "WarningVersion", "Wv:", "Warning Version", "", + cmVS7FlagTable::UserValue }, // Skip [TrackerLogDirectory] - no command line Switch. { "PreprocessOutputPath", "Fi", "Preprocess Output Path", "", cmVS7FlagTable::UserValue }, |