Kaynağa Gözat

Xcode: Rename internal variable {Platform => Generator}Toolset

The latter matches with CMAKE_GENERATOR_TOOLSET better.
Brad King 11 yıl önce
ebeveyn
işleme
3e9f6e36f3

+ 5 - 5
Source/cmGlobalXCodeGenerator.cxx

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

+ 1 - 1
Source/cmGlobalXCodeGenerator.h

@@ -246,7 +246,7 @@ private:
   std::map<std::string, cmXCodeObject* > TargetGroup;
   std::map<std::string, cmXCodeObject* > FileRefs;
   std::vector<std::string> Architectures;
-  std::string PlatformToolset;
+  std::string GeneratorToolset;
 };
 
 #endif