kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmTarget: Create helper method for versioned library names 

Replace the duplicate logic for the realName and soName of versioned
shared libraries with calls to a new ComputeVersionedName method.
This commit is contained in:
Brad King 2011-12-01 16:21:25 -05:00
parent 9401da8084
commit 96f65ba68e
2 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Source/cmTarget.cxx
View File

@ -131,6 +131,7 @@ cmTarget::cmTarget()
this->LinkLibrariesAnalyzed = false;
this->HaveInstallRule = false;
this->DLLPlatform = false;
this->IsApple = false;
this->IsImportedTarget = false;
}
@ -1207,6 +1208,9 @@ void cmTarget::SetMakefile(cmMakefile* mf)
this->Makefile->IsOn("CYGWIN") ||
this->Makefile->IsOn("MINGW"));
// Check whether we are targeting an Apple platform.
this->IsApple = this->Makefile->IsOn("APPLE");
// Setup default property values.
this->SetPropertyDefault("INSTALL_NAME_DIR", "");
this->SetPropertyDefault("INSTALL_RPATH", "");
@ -3348,7 +3352,11 @@ void cmTarget::GetLibraryNames(std::string& name,
// the library version as the soversion.
soversion = version;
}
bool isApple = this->Makefile->IsOn("APPLE");
if(!version && soversion)
{
// Use the soversion as the library version.
version = soversion;
}
// Get the components of the library name.
std::string prefix;
@ -3360,47 +3368,12 @@ void cmTarget::GetLibraryNames(std::string& name,
name = prefix+base+suffix;
// The library's soname.
if(isApple)
{
soName = prefix+base;
}
else
{
soName = name;
}
if(soversion)
{
soName += ".";
soName += soversion;
}
if(isApple)
{
soName += suffix;
}
this->ComputeVersionedName(soName, prefix, base, suffix,
name, soversion);
// The library's real name on disk.
if(isApple)
{
realName = prefix+base;
}
else
{
realName = name;
}
if(version)
{
realName += ".";
realName += version;
}
else if(soversion)
{
realName += ".";
realName += soversion;
}
if(isApple)
{
realName += suffix;
}
this->ComputeVersionedName(realName, prefix, base, suffix,
name, version);
// The import library name.
if(this->GetType() == cmTarget::SHARED_LIBRARY ||
@ -3417,6 +3390,23 @@ void cmTarget::GetLibraryNames(std::string& name,
pdbName = prefix+base+".pdb";
}
//----------------------------------------------------------------------------
void cmTarget::ComputeVersionedName(std::string& vName,
std::string const& prefix,
std::string const& base,
std::string const& suffix,
std::string const& name,
const char* version)
{
vName = this->IsApple? (prefix+base) : name;
if(version)
{
vName += ".";
vName += version;
}
vName += this->IsApple? suffix : std::string();
}
//----------------------------------------------------------------------------
void cmTarget::GetExecutableNames(std::string& name,
std::string& realName,

7
Source/cmTarget.h
View File

@ -557,6 +557,7 @@ private:
cmPropertyMap Properties;
LinkLibraryVectorType OriginalLinkLibraries;
bool DLLPlatform;
bool IsApple;
bool IsImportedTarget;
// Cache target output paths for each configuration.
@ -595,6 +596,12 @@ private:
cmTargetInternalPointer Internal;
void ConstructSourceFileFlags();
void ComputeVersionedName(std::string& vName,
std::string const& prefix,
std::string const& base,
std::string const& suffix,
std::string const& name,
const char* version);
};
typedef std::map<cmStdString,cmTarget> cmTargets;