diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-04 17:19:49 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-05 16:20:48 (GMT) |
| commit | 7c809fa2a675b7e669e76683f73397e38dd22999 (patch) | |
| tree | 41f75f44f46067e53e5bf76544d476ae8db41c99 /Source/cmGeneratorTarget.cxx | |
| parent | 6da99de3236fbaeebf6a4fc66f7d68f43a59902f (diff) | |
| download | CMake-7c809fa2a675b7e669e76683f73397e38dd22999.zip CMake-7c809fa2a675b7e669e76683f73397e38dd22999.tar.gz CMake-7c809fa2a675b7e669e76683f73397e38dd22999.tar.bz2 | |
cmGeneratorTarget: Move GetLinkerLanguage from cmTarget.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 834a2e3..4de5e9c 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -709,8 +709,7 @@ bool cmGeneratorTarget::HasSOName(const std::string& config) const return ((this->GetType() == cmTarget::SHARED_LIBRARY || this->GetType() == cmTarget::MODULE_LIBRARY) && !this->GetPropertyAsBool("NO_SONAME") && - this->Makefile->GetSONameFlag( - this->Target->GetLinkerLanguage(config))); + this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config))); } //---------------------------------------------------------------------------- @@ -752,7 +751,7 @@ cmGeneratorTarget::NeedRelinkBeforeInstall(const std::string& config) const } // Check for rpath support on this platform. - std::string ll = this->Target->GetLinkerLanguage(config); + std::string ll = this->GetLinkerLanguage(config); if(!ll.empty()) { std::string flagVar = "CMAKE_SHARED_LIBRARY_RUNTIME_"; @@ -823,7 +822,7 @@ bool cmGeneratorTarget::IsChrpathUsed(const std::string& config) const #if defined(CMAKE_USE_ELF_PARSER) // Enable if the rpath flag uses a separator and the target uses ELF // binaries. - std::string ll = this->Target->GetLinkerLanguage(config); + std::string ll = this->GetLinkerLanguage(config); if(!ll.empty()) { std::string sepVar = "CMAKE_SHARED_LIBRARY_RUNTIME_"; @@ -1986,7 +1985,7 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config, const char* suffixVar = this->Target->GetSuffixVariableInternal(implib); // Check for language-specific default prefix and suffix. - std::string ll = this->Target->GetLinkerLanguage(config); + std::string ll = this->GetLinkerLanguage(config); if(!ll.empty()) { if(!targetSuffix && suffixVar && *suffixVar) @@ -2056,6 +2055,13 @@ void cmGeneratorTarget::GetFullNameInternal(const std::string& config, //---------------------------------------------------------------------------- +std::string +cmGeneratorTarget::GetLinkerLanguage(const std::string& config) const +{ + return this->Target->GetLinkClosure(config)->LinkerLanguage; +} + +//---------------------------------------------------------------------------- std::string cmGeneratorTarget::GetPDBName(const std::string& config) const { std::string prefix; |