diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-10-16 17:19:51 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-10-16 18:24:44 (GMT) |
commit | beff29f0d4bf1ffface0e6833f29f2f04ceccf0b (patch) | |
tree | a5c2b35e96491f4073c2972090943e1623047381 /Source/cmGeneratorTarget.cxx | |
parent | 12e4790a0b40d8176940f855f7f6c9cfe6c39f9f (diff) | |
download | CMake-beff29f0d4bf1ffface0e6833f29f2f04ceccf0b.zip CMake-beff29f0d4bf1ffface0e6833f29f2f04ceccf0b.tar.gz CMake-beff29f0d4bf1ffface0e6833f29f2f04ceccf0b.tar.bz2 |
cmGeneratorTarget: Move ComputeVersionedName from cmTarget.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
-rw-r--r-- | Source/cmGeneratorTarget.cxx | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 7e4c917..4d153b7 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -3250,11 +3250,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& name, else { // The library's soname. - this->Target->ComputeVersionedName(soName, prefix, base, suffix, + this->ComputeVersionedName(soName, prefix, base, suffix, name, soversion); // The library's real name on disk. - this->Target->ComputeVersionedName(realName, prefix, base, suffix, + this->ComputeVersionedName(realName, prefix, base, suffix, name, version); } @@ -4437,6 +4437,23 @@ void cmGeneratorTarget::GetTargetVersion(bool soversion, } //---------------------------------------------------------------------------- +void cmGeneratorTarget::ComputeVersionedName(std::string& vName, + std::string const& prefix, + std::string const& base, + std::string const& suffix, + std::string const& name, + const char* version) const +{ + vName = this->Makefile->IsOn("APPLE") ? (prefix+base) : name; + if(version) + { + vName += "."; + vName += version; + } + vName += this->Makefile->IsOn("APPLE") ? suffix : std::string(); +} + +//---------------------------------------------------------------------------- void cmGeneratorTarget::ReportPropertyOrigin(const std::string &p, const std::string &result, |