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

Merge topic 'minor-cleanups' 

096f0988 cmComputeLinkDepends: Remove unused typedef.
ee44be22 cmGeneratorTarget: Use local GetProperty method.
4f767afe cmMakefile: Remove unneeded container clears.
c72d276a C::B: Remove unused variables.
c99b6cef cmLocalGenerator: Devirtualize method.
This commit is contained in:
Brad King 2015-10-12 10:26:13 -04:00 committed by CMake Topic Stage
parent 5dba212f3a 096f098849
commit f3fa7c6bc3
9 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmComputeLinkDepends.h
View File

@ -66,8 +66,6 @@ private:
std::string Config;
EntryVector FinalLinkEntries;
typedef cmTarget::LinkLibraryVectorType LinkLibraryVectorType;
std::map<std::string, int>::iterator
AllocateLinkEntry(std::string const& item);
int AddLinkEntry(cmLinkItem const& item);

12
Source/cmComputeLinkInformation.cxx
View File

@ -284,7 +284,7 @@ cmComputeLinkInformation
// Check whether we should skip dependencies on shared library files.
this->LinkDependsNoShared =
this->Target->Target->GetPropertyAsBool("LINK_DEPENDS_NO_SHARED");
this->Target->GetPropertyAsBool("LINK_DEPENDS_NO_SHARED");
// On platforms without import libraries there may be a special flag
// to use when creating a plugin (module) that obtains symbols from
@ -521,7 +521,7 @@ bool cmComputeLinkInformation::Compute()
// Restore the target link type so the correct system runtime
// libraries are found.
const char* lss =
this->Target->Target->GetProperty("LINK_SEARCH_END_STATIC");
this->Target->GetProperty("LINK_SEARCH_END_STATIC");
if(cmSystemTools::IsOn(lss))
{
this->SetCurrentLinkType(LinkStatic);
@ -860,7 +860,7 @@ void cmComputeLinkInformation::ComputeLinkTypeInfo()
// Lookup the starting link type from the target (linked statically?).
const char* lss =
this->Target->Target->GetProperty("LINK_SEARCH_START_STATIC");
this->Target->GetProperty("LINK_SEARCH_START_STATIC");
this->StartLinkType = cmSystemTools::IsOn(lss)? LinkStatic : LinkShared;
this->CurrentLinkType = this->StartLinkType;
}
@ -1918,7 +1918,7 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
// build tree.
bool linking_for_install =
(for_install ||
this->Target->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
this->Target->GetPropertyAsBool("BUILD_WITH_INSTALL_RPATH"));
bool use_install_rpath =
(outputRuntime && this->Target->Target->HaveInstallTreeRPATH() &&
linking_for_install);
@ -1928,14 +1928,14 @@ void cmComputeLinkInformation::GetRPath(std::vector<std::string>& runtimeDirs,
bool use_link_rpath =
outputRuntime && linking_for_install &&
!this->Makefile->IsOn("CMAKE_SKIP_INSTALL_RPATH") &&
this->Target->Target->GetPropertyAsBool("INSTALL_RPATH_USE_LINK_PATH");
this->Target->GetPropertyAsBool("INSTALL_RPATH_USE_LINK_PATH");
// Construct the RPATH.
std::set<std::string> emitted;
if(use_install_rpath)
{
const char* install_rpath =
this->Target->Target->GetProperty("INSTALL_RPATH");
this->Target->GetProperty("INSTALL_RPATH");
cmCLI_ExpandListUnique(install_rpath, runtimeDirs, emitted);
}
if(use_build_rpath || use_link_rpath)

2
Source/cmExtraCodeBlocksGenerator.cxx
View File

@ -693,8 +693,6 @@ std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf)
compilerIdVar = "CMAKE_C_COMPILER_ID";
}
std::string hostSystemName = mf->GetSafeDefinition("CMAKE_HOST_SYSTEM_NAME");
std::string systemName = mf->GetSafeDefinition("CMAKE_SYSTEM_NAME");
std::string compilerId = mf->GetSafeDefinition(compilerIdVar);
std::string compiler = "gcc"; // default to gcc
if (compilerId == "MSVC")

28
Source/cmGeneratorTarget.cxx
View File

@ -381,7 +381,7 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
for(std::vector<std::string>::const_iterator it = props.begin();
it != props.end(); ++it)
{
if (const char* outNameProp = this->Target->GetProperty(*it))
if (const char* outNameProp = this->GetProperty(*it))
{
outName = outNameProp;
break;
@ -555,12 +555,12 @@ const char* cmGeneratorTarget::GetFeature(const std::string& feature,
std::string featureConfig = feature;
featureConfig += "_";
featureConfig += cmSystemTools::UpperCase(config);
if(const char* value = this->Target->GetProperty(featureConfig))
if(const char* value = this->GetProperty(featureConfig))
{
return value;
}
}
if(const char* value = this->Target->GetProperty(feature))
if(const char* value = this->GetProperty(feature))
{
return value;
}
@ -793,7 +793,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir,
"SYSTEM_INCLUDE_DIRECTORIES", 0, 0);
bool excludeImported
= this->Target->GetPropertyAsBool("NO_SYSTEM_FROM_IMPORTED");
= this->GetPropertyAsBool("NO_SYSTEM_FROM_IMPORTED");
std::vector<std::string> result;
for (std::set<std::string>::const_iterator
@ -1106,13 +1106,13 @@ cmGeneratorTarget::GetCompilePDBName(const std::string& config) const
std::string configUpper = cmSystemTools::UpperCase(config);
std::string configProp = "COMPILE_PDB_NAME_";
configProp += configUpper;
const char* config_name = this->Target->GetProperty(configProp);
const char* config_name = this->GetProperty(configProp);
if(config_name && *config_name)
{
return prefix + config_name + ".pdb";
}
const char* name = this->Target->GetProperty("COMPILE_PDB_NAME");
const char* name = this->GetProperty("COMPILE_PDB_NAME");
if(name && *name)
{
return prefix + name + ".pdb";
@ -1357,7 +1357,7 @@ std::string cmGeneratorTarget::GetCFBundleDirectory(const std::string& config,
std::string fpath;
fpath += this->GetOutputName(config, false);
fpath += ".";
const char *ext = this->Target->GetProperty("BUNDLE_EXTENSION");
const char *ext = this->GetProperty("BUNDLE_EXTENSION");
if (!ext)
{
if (this->Target->IsXCTestOnApple())
@ -2278,11 +2278,11 @@ void cmGeneratorTarget::GetAppleArchs(const std::string& config,
{
std::string defVarName = "OSX_ARCHITECTURES_";
defVarName += cmSystemTools::UpperCase(config);
archs = this->Target->GetProperty(defVarName);
archs = this->GetProperty(defVarName);
}
if(!archs)
{
archs = this->Target->GetProperty("OSX_ARCHITECTURES");
archs = this->GetProperty("OSX_ARCHITECTURES");
}
if(archs)
{
@ -2785,7 +2785,7 @@ void cmGeneratorTarget::GetCompileDefinitions(std::vector<std::string> &list,
{
std::string configPropName = "COMPILE_DEFINITIONS_"
+ cmSystemTools::UpperCase(config);
const char *configProp = this->Target->GetProperty(configPropName);
const char *configProp = this->GetProperty(configPropName);
if (configProp)
{
switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0043))
@ -3369,7 +3369,7 @@ void cmGeneratorTarget::ConstructSourceFileFlags() const
this->SourceFileFlagsConstructed = true;
// Process public headers to mark the source files.
if(const char* files = this->Target->GetProperty("PUBLIC_HEADER"))
if(const char* files = this->GetProperty("PUBLIC_HEADER"))
{
std::vector<std::string> relFiles;
cmSystemTools::ExpandListArgument(files, relFiles);
@ -3387,7 +3387,7 @@ void cmGeneratorTarget::ConstructSourceFileFlags() const
// Process private headers after public headers so that they take
// precedence if a file is listed in both.
if(const char* files = this->Target->GetProperty("PRIVATE_HEADER"))
if(const char* files = this->GetProperty("PRIVATE_HEADER"))
{
std::vector<std::string> relFiles;
cmSystemTools::ExpandListArgument(files, relFiles);
@ -3404,7 +3404,7 @@ void cmGeneratorTarget::ConstructSourceFileFlags() const
}
// Mark sources listed as resources.
if(const char* files = this->Target->GetProperty("RESOURCE"))
if(const char* files = this->GetProperty("RESOURCE"))
{
std::vector<std::string> relFiles;
cmSystemTools::ExpandListArgument(files, relFiles);
@ -4813,7 +4813,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLanguages(
//----------------------------------------------------------------------------
bool cmGeneratorTarget::HaveBuildTreeRPATH(const std::string& config) const
{
if (this->Target->GetPropertyAsBool("SKIP_BUILD_RPATH"))
if (this->GetPropertyAsBool("SKIP_BUILD_RPATH"))
{
return false;
}

2
Source/cmGlobalGenerator.cxx
View File

@ -2033,7 +2033,7 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root,
cmGeneratorTarget* target) const
{
if(target->GetType() == cmTarget::INTERFACE_LIBRARY
|| target->Target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
|| target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
// This target is excluded from its directory.
return true;

2
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -937,7 +937,7 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
cmLocalGenerator* tlg = gt->GetLocalGenerator();
if(gt->GetType() == cmTarget::INTERFACE_LIBRARY
|| gt->Target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
|| gt->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
continue;
}

2
Source/cmInstallTargetGenerator.cxx
View File

@ -823,7 +823,7 @@ cmInstallTargetGenerator::AddStripRule(std::ostream& os,
// Don't handle OSX Bundles.
if(this->Target->Target->GetMakefile()->IsOn("APPLE") &&
this->Target->Target->GetPropertyAsBool("MACOSX_BUNDLE"))
this->Target->GetPropertyAsBool("MACOSX_BUNDLE"))
{
return;
}

2
Source/cmLocalGenerator.h
View File

@ -187,7 +187,7 @@ public:
// Fill the vector with the target names for the object files,
// preprocessed files and assembly files.
virtual void GetIndividualFileTargets(std::vector<std::string>&) {}
void GetIndividualFileTargets(std::vector<std::string>&) {}
// Create a struct to hold the varibles passed into
// ExpandRuleVariables

3
Source/cmMakefile.cxx
View File

@ -161,9 +161,6 @@ cmMakefile::~cmMakefile()
cmDeleteAll(this->FinalPassCommands);
cmDeleteAll(this->FunctionBlockers);
cmDeleteAll(this->EvaluationFiles);
this->EvaluationFiles.clear();
this->FunctionBlockers.clear();
}
//----------------------------------------------------------------------------