diff options
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 11 | ||||
| -rw-r--r-- | Source/cmServerProtocol.cxx | 2 | ||||
| -rw-r--r-- | Source/cmVS140CLFlagTable.h | 2 | ||||
| -rw-r--r-- | Source/cmVS141CLFlagTable.h | 1 |
4 files changed, 14 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index caaac87..502c93a 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -93,7 +93,16 @@ cmGlobalVisualStudio10Generator::cmGlobalVisualStudio10Generator( this->SystemIsWindowsPhone = false; this->SystemIsWindowsStore = false; this->MSBuildCommandInitialized = false; - this->DefaultPlatformToolset = "v100"; + { + std::string envPlatformToolset; + if (cmSystemTools::GetEnv("PlatformToolset", envPlatformToolset) && + envPlatformToolset == "Windows7.1SDK") { + // We are running from a Windows7.1SDK command prompt. + this->DefaultPlatformToolset = "Windows7.1SDK"; + } else { + this->DefaultPlatformToolset = "v100"; + } + } this->Version = VS10; } diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index d35efe0..e159c8f 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -923,7 +923,7 @@ cmServerResponse cmServerProtocol1_0::ProcessConfigure( } // Make sure the types of cacheArguments matches (if given): - std::vector<std::string> cacheArgs; + std::vector<std::string> cacheArgs = { "unused" }; bool cacheArgumentsError = false; const Json::Value passedArgs = request.Data[kCACHE_ARGUMENTS_KEY]; if (!passedArgs.isNull()) { 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 }, |