|
@@ -206,7 +206,7 @@ bool cmGlobalXCodeGenerator::SetGeneratorToolset(std::string const& ts)
|
|
|
{
|
|
{
|
|
|
if(this->XcodeVersion >= 30)
|
|
if(this->XcodeVersion >= 30)
|
|
|
{
|
|
{
|
|
|
- this->PlatformToolset = ts;
|
|
|
|
|
|
|
+ this->GeneratorToolset = ts;
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
else
|
|
else
|
|
@@ -239,10 +239,10 @@ void cmGlobalXCodeGenerator::EnableLanguage(std::vector<std::string>const&
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
|
|
mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
|
|
|
- if(!this->PlatformToolset.empty())
|
|
|
|
|
|
|
+ if(!this->GeneratorToolset.empty())
|
|
|
{
|
|
{
|
|
|
mf->AddDefinition("CMAKE_XCODE_PLATFORM_TOOLSET",
|
|
mf->AddDefinition("CMAKE_XCODE_PLATFORM_TOOLSET",
|
|
|
- this->PlatformToolset.c_str());
|
|
|
|
|
|
|
+ this->GeneratorToolset.c_str());
|
|
|
}
|
|
}
|
|
|
this->cmGlobalGenerator::EnableLanguage(lang, mf, optional);
|
|
this->cmGlobalGenerator::EnableLanguage(lang, mf, optional);
|
|
|
const char* osxArch =
|
|
const char* osxArch =
|
|
@@ -3363,10 +3363,10 @@ void cmGlobalXCodeGenerator
|
|
|
buildSettings->AddAttribute("MACOSX_DEPLOYMENT_TARGET",
|
|
buildSettings->AddAttribute("MACOSX_DEPLOYMENT_TARGET",
|
|
|
this->CreateString(deploymentTarget));
|
|
this->CreateString(deploymentTarget));
|
|
|
}
|
|
}
|
|
|
- if(!this->PlatformToolset.empty())
|
|
|
|
|
|
|
+ if(!this->GeneratorToolset.empty())
|
|
|
{
|
|
{
|
|
|
buildSettings->AddAttribute("GCC_VERSION",
|
|
buildSettings->AddAttribute("GCC_VERSION",
|
|
|
- this->CreateString(this->PlatformToolset.c_str()));
|
|
|
|
|
|
|
+ this->CreateString(this->GeneratorToolset.c_str()));
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// Put this last so it can override existing settings
|
|
// Put this last so it can override existing settings
|