diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-30 14:30:41 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-30 14:30:41 -0500 |
| commit | 0d89c1e87cac3ae02bd2c9864588accbd406e919 (patch) | |
| tree | bbe5f90c7a427fe33356e2015de2c2e489710d4d | |
| parent | d69cf34708bc0d9d737505eca14c217494604a93 (diff) | |
| parent | 418afd5b2c4e7e55f157e05d3afb1223d38d4829 (diff) | |
| download | cmake-0d89c1e87cac3ae02bd2c9864588accbd406e919.tar.gz | |
Merge branch 'vs-Zc-inline' into release
| -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 317cc185e1..60b4379743 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 895b3e854f..f751fc875d 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 }, |