diff options
| author | Brad King <brad.king@kitware.com> | 2012-09-21 12:47:02 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-09-21 12:47:02 (GMT) |
| commit | 33a60e6bd148479c63734286417f582444bf36b6 (patch) | |
| tree | 64c6d95fc0ab29f46fd7b1542a8008dc628f198e | |
| parent | bb18bb7f55327a40ce3f6585d9756f7a25dea2e8 (diff) | |
| download | CMake-33a60e6bd148479c63734286417f582444bf36b6.zip CMake-33a60e6bd148479c63734286417f582444bf36b6.tar.gz CMake-33a60e6bd148479c63734286417f582444bf36b6.tar.bz2 | |
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.
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index e8ab38f..5fdfcf8 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -3118,18 +3118,14 @@ void cmGlobalXCodeGenerator const char* sysroot = this->CurrentMakefile->GetDefinition("CMAKE_OSX_SYSROOT"); - const char* sysrootDefault = - this->CurrentMakefile->GetDefinition("CMAKE_OSX_SYSROOT_DEFAULT"); const char* deploymentTarget = this->CurrentMakefile->GetDefinition("CMAKE_OSX_DEPLOYMENT_TARGET"); if(osxArch && sysroot) { - bool flagsUsed = false; // recompute this as it may have been changed since enable language this->Architectures.clear(); cmSystemTools::ExpandListArgument(std::string(osxArch), this->Architectures); - flagsUsed = true; buildSettings->AddAttribute("SDKROOT", this->CreateString(sysroot)); std::string archString; @@ -3144,12 +3140,6 @@ void cmGlobalXCodeGenerator } buildSettings->AddAttribute("ARCHS", this->CreateString(archString.c_str())); - if(!flagsUsed && sysrootDefault && - strcmp(sysroot, sysrootDefault) != 0) - { - buildSettings->AddAttribute("SDKROOT", - this->CreateString(sysroot)); - } } if(deploymentTarget && *deploymentTarget) { |