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

cmGeneratorTarget: Use local GetProperty method.

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-07 21:50:29 +02:00
parent 4f767afe1d
commit ee44be22cb
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmComputeLinkInformation.cxx
View File

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

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

2
Source/cmGlobalGenerator.cxx
View File

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

2
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

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

2
Source/cmInstallTargetGenerator.cxx
View File

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