diff options
author | Brad King <brad.king@kitware.com> | 2014-06-04 17:07:08 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-06-04 17:16:37 (GMT) |
commit | 3e9f6e36f3f5fd50303d1b71fc153c0ae8f916f5 (patch) | |
tree | 1d07c792c90c271d1099d18604280f0fd2c65ca4 | |
parent | 2336ec514080014430589166287e076c7e5608d8 (diff) | |
download | CMake-3e9f6e36f3f5fd50303d1b71fc153c0ae8f916f5.zip CMake-3e9f6e36f3f5fd50303d1b71fc153c0ae8f916f5.tar.gz CMake-3e9f6e36f3f5fd50303d1b71fc153c0ae8f916f5.tar.bz2 |
Xcode: Rename internal variable {Platform => Generator}Toolset
The latter matches with CMAKE_GENERATOR_TOOLSET better.
-rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 10 | ||||
-rw-r--r-- | Source/cmGlobalXCodeGenerator.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index e5fc436..6c0eaea 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/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 diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h index c9937ed..ecbc3f9 100644 --- a/Source/cmGlobalXCodeGenerator.h +++ b/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 |