kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Xcode: Remove unused code reading CMAKE_OSX_SYSROOT_DEFAULT 

The condition for entering the block where the value is used
can never be true anymore.
This commit is contained in:
Brad King 2012-09-21 08:47:02 -04:00
parent bb18bb7f55
commit 33a60e6bd1
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmGlobalXCodeGenerator.cxx
View File

@ -3118,18 +3118,14 @@ void cmGlobalXCodeGenerator
const char* sysroot = const char* sysroot =
this->CurrentMakefile->GetDefinition("CMAKE_OSX_SYSROOT"); this->CurrentMakefile->GetDefinition("CMAKE_OSX_SYSROOT");
const char* sysrootDefault =
this->CurrentMakefile->GetDefinition("CMAKE_OSX_SYSROOT_DEFAULT");
const char* deploymentTarget = const char* deploymentTarget =
this->CurrentMakefile->GetDefinition("CMAKE_OSX_DEPLOYMENT_TARGET"); this->CurrentMakefile->GetDefinition("CMAKE_OSX_DEPLOYMENT_TARGET");
if(osxArch && sysroot) if(osxArch && sysroot)
{ {
bool flagsUsed = false;
// recompute this as it may have been changed since enable language // recompute this as it may have been changed since enable language
this->Architectures.clear(); this->Architectures.clear();
cmSystemTools::ExpandListArgument(std::string(osxArch), cmSystemTools::ExpandListArgument(std::string(osxArch),
this->Architectures); this->Architectures);
flagsUsed = true;
buildSettings->AddAttribute("SDKROOT", buildSettings->AddAttribute("SDKROOT",
this->CreateString(sysroot)); this->CreateString(sysroot));
std::string archString; std::string archString;
@ -3144,12 +3140,6 @@ void cmGlobalXCodeGenerator
} }
buildSettings->AddAttribute("ARCHS", buildSettings->AddAttribute("ARCHS",
this->CreateString(archString.c_str())); this->CreateString(archString.c_str()));
if(!flagsUsed && sysrootDefault &&
strcmp(sysroot, sysrootDefault) != 0)
{
buildSettings->AddAttribute("SDKROOT",
this->CreateString(sysroot));
}
} }
if(deploymentTarget && *deploymentTarget) if(deploymentTarget && *deploymentTarget)
{ {