소스 검색

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.
Brad King 13 년 전
부모
커밋
33a60e6bd1
1개의 변경된 파일0개의 추가작업 그리고 10개의 파일을 삭제
  1. 0 10
      Source/cmGlobalXCodeGenerator.cxx

+ 0 - 10
Source/cmGlobalXCodeGenerator.cxx

@@ -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)
     {
     {