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

ENH: Remove cmTarget internal type arguments 

Internally cmTarget was passing the target type in several name
computation signatures to support computation of both shared and static
library names for one target.  We no longer need to compute both names,
so this change simplifies the internals by using the GetType method and
dropping the type from method signatures.
This commit is contained in:
Brad King 2009-05-01 10:39:44 -04:00
parent bcb9a479db
commit 392b38cef7
2 changed files with 35 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
Source/cmTarget.cxx
View File

@ -2319,10 +2319,9 @@ const char* cmTarget::GetCreateRuleVariable()
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
const char* cmTarget::GetSuffixVariableInternal(TargetType type, const char* cmTarget::GetSuffixVariableInternal(bool implib)
bool implib)
{ {
switch(type) switch(this->GetType())
{ {
case cmTarget::STATIC_LIBRARY: case cmTarget::STATIC_LIBRARY:
return "CMAKE_STATIC_LIBRARY_SUFFIX"; return "CMAKE_STATIC_LIBRARY_SUFFIX";
@ -2346,10 +2345,9 @@ const char* cmTarget::GetSuffixVariableInternal(TargetType type,
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
const char* cmTarget::GetPrefixVariableInternal(TargetType type, const char* cmTarget::GetPrefixVariableInternal(bool implib)
bool implib)
{ {
switch(type) switch(this->GetType())
{ {
case cmTarget::STATIC_LIBRARY: case cmTarget::STATIC_LIBRARY:
return "CMAKE_STATIC_LIBRARY_PREFIX"; return "CMAKE_STATIC_LIBRARY_PREFIX";
@ -2375,8 +2373,7 @@ std::string cmTarget::GetPDBName(const char* config)
std::string prefix; std::string prefix;
std::string base; std::string base;
std::string suffix; std::string suffix;
this->GetFullNameInternal(this->GetType(), config, false, this->GetFullNameInternal(config, false, prefix, base, suffix);
prefix, base, suffix);
return prefix+base+".pdb"; return prefix+base+".pdb";
} }
@ -2478,7 +2475,7 @@ std::string cmTarget::GetFullName(const char* config, bool implib)
} }
else else
{ {
return this->GetFullNameInternal(this->GetType(), config, implib); return this->GetFullNameInternal(config, implib);
} }
} }
@ -2494,8 +2491,7 @@ void cmTarget::GetFullNameComponents(std::string& prefix, std::string& base,
std::string& suffix, const char* config, std::string& suffix, const char* config,
bool implib) bool implib)
{ {
this->GetFullNameInternal(this->GetType(), config, implib, this->GetFullNameInternal(config, implib, prefix, base, suffix);
prefix, base, suffix);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -2566,30 +2562,27 @@ std::string cmTarget::ImportedGetFullPath(const char* config, bool implib)
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
std::string std::string cmTarget::GetFullNameInternal(const char* config, bool implib)
cmTarget::GetFullNameInternal(TargetType type, const char* config,
bool implib)
{ {
std::string prefix; std::string prefix;
std::string base; std::string base;
std::string suffix; std::string suffix;
this->GetFullNameInternal(type, config, implib, prefix, base, suffix); this->GetFullNameInternal(config, implib, prefix, base, suffix);
return prefix+base+suffix; return prefix+base+suffix;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmTarget::GetFullNameInternal(TargetType type, void cmTarget::GetFullNameInternal(const char* config,
const char* config,
bool implib, bool implib,
std::string& outPrefix, std::string& outPrefix,
std::string& outBase, std::string& outBase,
std::string& outSuffix) std::string& outSuffix)
{ {
// Use just the target name for non-main target types. // Use just the target name for non-main target types.
if(type != cmTarget::STATIC_LIBRARY && if(this->GetType() != cmTarget::STATIC_LIBRARY &&
type != cmTarget::SHARED_LIBRARY && this->GetType() != cmTarget::SHARED_LIBRARY &&
type != cmTarget::MODULE_LIBRARY && this->GetType() != cmTarget::MODULE_LIBRARY &&
type != cmTarget::EXECUTABLE) this->GetType() != cmTarget::EXECUTABLE)
{ {
outPrefix = ""; outPrefix = "";
outBase = this->GetName(); outBase = this->GetName();
@ -2610,9 +2603,9 @@ void cmTarget::GetFullNameInternal(TargetType type,
// The implib option is only allowed for shared libraries, module // The implib option is only allowed for shared libraries, module
// libraries, and executables. // libraries, and executables.
if(type != cmTarget::SHARED_LIBRARY && if(this->GetType() != cmTarget::SHARED_LIBRARY &&
type != cmTarget::MODULE_LIBRARY && this->GetType() != cmTarget::MODULE_LIBRARY &&
type != cmTarget::EXECUTABLE) this->GetType() != cmTarget::EXECUTABLE)
{ {
implib = false; implib = false;
} }
@ -2637,8 +2630,8 @@ void cmTarget::GetFullNameInternal(TargetType type,
configPostfix = 0; configPostfix = 0;
} }
} }
const char* prefixVar = this->GetPrefixVariableInternal(type, implib); const char* prefixVar = this->GetPrefixVariableInternal(implib);
const char* suffixVar = this->GetSuffixVariableInternal(type, implib); const char* suffixVar = this->GetSuffixVariableInternal(implib);
const char* ll = const char* ll =
this->GetLinkerLanguage( this->GetLinkerLanguage(
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()); this->Makefile->GetLocalGenerator()->GetGlobalGenerator());
@ -2687,7 +2680,7 @@ void cmTarget::GetFullNameInternal(TargetType type,
// Name shared libraries with their version number on some platforms. // Name shared libraries with their version number on some platforms.
if(const char* version = this->GetProperty("VERSION")) if(const char* version = this->GetProperty("VERSION"))
{ {
if(type == cmTarget::SHARED_LIBRARY && !implib && if(this->GetType() == cmTarget::SHARED_LIBRARY && !implib &&
this->Makefile->IsOn("CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION")) this->Makefile->IsOn("CMAKE_SHARED_LIBRARY_NAME_WITH_VERSION"))
{ {
outBase += "-"; outBase += "-";
@ -2706,27 +2699,13 @@ void cmTarget::GetLibraryNames(std::string& name,
std::string& impName, std::string& impName,
std::string& pdbName, std::string& pdbName,
const char* config) const char* config)
{
// Get the names based on the real type of the library.
this->GetLibraryNamesInternal(name, soName, realName, impName, pdbName,
this->GetType(), config);
}
//----------------------------------------------------------------------------
void cmTarget::GetLibraryNamesInternal(std::string& name,
std::string& soName,
std::string& realName,
std::string& impName,
std::string& pdbName,
TargetType type,
const char* config)
{ {
// This should not be called for imported targets. // This should not be called for imported targets.
// TODO: Split cmTarget into a class hierarchy to get compile-time // TODO: Split cmTarget into a class hierarchy to get compile-time
// enforcement of the limited imported target API. // enforcement of the limited imported target API.
if(this->IsImported()) if(this->IsImported())
{ {
std::string msg = "GetLibraryNamesInternal called on imported target: "; std::string msg = "GetLibraryNames called on imported target: ";
msg += this->GetName(); msg += this->GetName();
this->Makefile->IssueMessage(cmake::INTERNAL_ERROR, this->Makefile->IssueMessage(cmake::INTERNAL_ERROR,
msg.c_str()); msg.c_str());
@ -2748,7 +2727,8 @@ void cmTarget::GetLibraryNamesInternal(std::string& name,
// Check for library version properties. // Check for library version properties.
const char* version = this->GetProperty("VERSION"); const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION"); const char* soversion = this->GetProperty("SOVERSION");
if((type != cmTarget::SHARED_LIBRARY && type != cmTarget::MODULE_LIBRARY) || if((this->GetType() != cmTarget::SHARED_LIBRARY &&
this->GetType() != cmTarget::MODULE_LIBRARY) ||
!this->Makefile->GetDefinition(sonameFlag.c_str()) || !this->Makefile->GetDefinition(sonameFlag.c_str()) ||
this->IsFrameworkOnApple()) this->IsFrameworkOnApple())
{ {
@ -2768,7 +2748,7 @@ void cmTarget::GetLibraryNamesInternal(std::string& name,
std::string prefix; std::string prefix;
std::string base; std::string base;
std::string suffix; std::string suffix;
this->GetFullNameInternal(type, config, false, prefix, base, suffix); this->GetFullNameInternal(config, false, prefix, base, suffix);
// The library name. // The library name.
name = prefix+base+suffix; name = prefix+base+suffix;
@ -2809,10 +2789,10 @@ void cmTarget::GetLibraryNamesInternal(std::string& name,
#endif #endif
// The import library name. // The import library name.
if(type == cmTarget::SHARED_LIBRARY || if(this->GetType() == cmTarget::SHARED_LIBRARY ||
type == cmTarget::MODULE_LIBRARY) this->GetType() == cmTarget::MODULE_LIBRARY)
{ {
impName = this->GetFullNameInternal(type, config, true); impName = this->GetFullNameInternal(config, true);
} }
else else
{ {
@ -2829,19 +2809,6 @@ void cmTarget::GetExecutableNames(std::string& name,
std::string& impName, std::string& impName,
std::string& pdbName, std::string& pdbName,
const char* config) const char* config)
{
// Get the names based on the real type of the executable.
this->GetExecutableNamesInternal(name, realName, impName, pdbName,
this->GetType(), config);
}
//----------------------------------------------------------------------------
void cmTarget::GetExecutableNamesInternal(std::string& name,
std::string& realName,
std::string& impName,
std::string& pdbName,
TargetType type,
const char* config)
{ {
// This should not be called for imported targets. // This should not be called for imported targets.
// TODO: Split cmTarget into a class hierarchy to get compile-time // TODO: Split cmTarget into a class hierarchy to get compile-time
@ -2849,7 +2816,7 @@ void cmTarget::GetExecutableNamesInternal(std::string& name,
if(this->IsImported()) if(this->IsImported())
{ {
std::string msg = std::string msg =
"GetExecutableNamesInternal called on imported target: "; "GetExecutableNames called on imported target: ";
msg += this->GetName(); msg += this->GetName();
this->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR, msg.c_str()); this->GetMakefile()->IssueMessage(cmake::INTERNAL_ERROR, msg.c_str());
} }
@ -2861,7 +2828,7 @@ void cmTarget::GetExecutableNamesInternal(std::string& name,
#else #else
// Check for executable version properties. // Check for executable version properties.
const char* version = this->GetProperty("VERSION"); const char* version = this->GetProperty("VERSION");
if(type != cmTarget::EXECUTABLE || this->Makefile->IsOn("XCODE")) if(this->GetType() != cmTarget::EXECUTABLE || this->Makefile->IsOn("XCODE"))
{ {
version = 0; version = 0;
} }
@ -2871,7 +2838,7 @@ void cmTarget::GetExecutableNamesInternal(std::string& name,
std::string prefix; std::string prefix;
std::string base; std::string base;
std::string suffix; std::string suffix;
this->GetFullNameInternal(type, config, false, prefix, base, suffix); this->GetFullNameInternal(config, false, prefix, base, suffix);
// The executable name. // The executable name.
name = prefix+base+suffix; name = prefix+base+suffix;
@ -2892,7 +2859,7 @@ void cmTarget::GetExecutableNamesInternal(std::string& name,
#endif #endif
// The import library name. // The import library name.
impName = this->GetFullNameInternal(type, config, true); impName = this->GetFullNameInternal(config, true);
// The program database file name. // The program database file name.
pdbName = prefix+base+".pdb"; pdbName = prefix+base+".pdb";

23
Source/cmTarget.h
View File

@ -448,28 +448,13 @@ private:
const LibraryID& lib, const LibraryID& lib,
DependencyMap& dep_map); DependencyMap& dep_map);
const char* GetSuffixVariableInternal(TargetType type, bool implib); const char* GetSuffixVariableInternal(bool implib);
const char* GetPrefixVariableInternal(TargetType type, bool implib); const char* GetPrefixVariableInternal(bool implib);
std::string GetFullNameInternal(TargetType type, const char* config, std::string GetFullNameInternal(const char* config, bool implib);
bool implib); void GetFullNameInternal(const char* config, bool implib,
void GetFullNameInternal(TargetType type, const char* config, bool implib,
std::string& outPrefix, std::string& outBase, std::string& outPrefix, std::string& outBase,
std::string& outSuffix); std::string& outSuffix);
void GetLibraryNamesInternal(std::string& name,
std::string& soName,
std::string& realName,
std::string& impName,
std::string& pdbName,
TargetType type,
const char* config);
void GetExecutableNamesInternal(std::string& name,
std::string& realName,
std::string& impName,
std::string& pdbName,
TargetType type,
const char* config);
// Use a makefile variable to set a default for the given property. // Use a makefile variable to set a default for the given property.
// If the variable is not defined use the given default instead. // If the variable is not defined use the given default instead.
void SetPropertyDefault(const char* property, const char* default_value); void SetPropertyDefault(const char* property, const char* default_value);