diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-01 13:50:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-12-01 13:50:46 (GMT) |
| commit | 5e36feebd4bcf4e7a6025a092fc257a33bbe6dc1 (patch) | |
| tree | ff4ee48f03857443712a54a58d40ebe1c8c71c91 /Source | |
| parent | 23a63d202417f3d31273041a04b16af2ff361e54 (diff) | |
| parent | 418afd5b2c4e7e55f157e05d3afb1223d38d4829 (diff) | |
| download | CMake-5e36feebd4bcf4e7a6025a092fc257a33bbe6dc1.zip CMake-5e36feebd4bcf4e7a6025a092fc257a33bbe6dc1.tar.gz CMake-5e36feebd4bcf4e7a6025a092fc257a33bbe6dc1.tar.bz2 | |
Merge topic 'vs-Zc-inline'
418afd5b VS: Add v140 flag table entries for `-Zc:inline[-]`
315d44f7 VS: Add v141 flag table entry for `-Zc:inline-`
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVS140CLFlagTable.h | 2 | ||||
| -rw-r--r-- | Source/cmVS141CLFlagTable.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmVS140CLFlagTable.h b/Source/cmVS140CLFlagTable.h index 317cc18..60b4379 100644 --- a/Source/cmVS140CLFlagTable.h +++ b/Source/cmVS140CLFlagTable.h @@ -164,6 +164,8 @@ static cmVS7FlagTable cmVS140CLFlagTable[] = { { "TreatWChar_tAsBuiltInType", "Zc:wchar_t", "", "true", 0 }, { "ForceConformanceInForLoopScope", "Zc:forScope-", "", "false", 0 }, { "ForceConformanceInForLoopScope", "Zc:forScope", "", "true", 0 }, + { "RemoveUnreferencedCodeData", "Zc:inline-", "", "false", 0 }, + { "RemoveUnreferencedCodeData", "Zc:inline", "", "true", 0 }, { "RuntimeTypeInfo", "GR-", "", "false", 0 }, { "RuntimeTypeInfo", "GR", "", "true", 0 }, { "OpenMPSupport", "openmp-", "", "false", 0 }, diff --git a/Source/cmVS141CLFlagTable.h b/Source/cmVS141CLFlagTable.h index 895b3e8..f751fc8 100644 --- a/Source/cmVS141CLFlagTable.h +++ b/Source/cmVS141CLFlagTable.h @@ -171,6 +171,7 @@ static cmVS7FlagTable cmVS141CLFlagTable[] = { { "TreatWChar_tAsBuiltInType", "Zc:wchar_t", "", "true", 0 }, { "ForceConformanceInForLoopScope", "Zc:forScope-", "", "false", 0 }, { "ForceConformanceInForLoopScope", "Zc:forScope", "", "true", 0 }, + { "RemoveUnreferencedCodeData", "Zc:inline-", "", "false", 0 }, { "RemoveUnreferencedCodeData", "Zc:inline", "", "true", 0 }, { "EnforceTypeConversionRules", "Zc:rvalueCast-", "", "false", 0 }, { "EnforceTypeConversionRules", "Zc:rvalueCast", "", "true", 0 }, |