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

Merge topic 'remove-Properties-accessor' 

c6055d9d cmMakefile: Remove GetProperties method.
cbe3ee58 cmMakefile: Add a PropertyKeys accessor.
This commit is contained in:
Brad King 2015-07-21 09:22:17 -04:00 committed by CMake Topic Stage
parent 64aa41b248 c6055d9d4c
commit 93b393e74c
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -814,14 +814,15 @@ void cmGlobalVisualStudio7Generator
{
bool extensibilityGlobalsOverridden = false;
bool extensibilityAddInsOverridden = false;
const cmPropertyMap& props = root->GetMakefile()->GetProperties();
for(cmPropertyMap::const_iterator itProp = props.begin();
itProp != props.end(); ++itProp)
const std::vector<std::string> propKeys =
root->GetMakefile()->GetPropertyKeys();
for(std::vector<std::string>::const_iterator it = propKeys.begin();
it != propKeys.end(); ++it)
{
if(itProp->first.find("VS_GLOBAL_SECTION_") == 0)
if(it->find("VS_GLOBAL_SECTION_") == 0)
{
std::string sectionType;
std::string name = itProp->first.substr(18);
std::string name = it->substr(18);
if(name.find("PRE_") == 0)
{
name = name.substr(4);
@ -842,8 +843,9 @@ void cmGlobalVisualStudio7Generator
extensibilityAddInsOverridden = true;
fout << "\tGlobalSection(" << name << ") = " << sectionType << "\n";
std::vector<std::string> keyValuePairs;
cmSystemTools::ExpandListArgument(itProp->second.GetValue(),
keyValuePairs);
cmSystemTools::ExpandListArgument(
root->GetMakefile()->GetProperty(it->c_str()),
keyValuePairs);
for(std::vector<std::string>::const_iterator itPair =
keyValuePairs.begin(); itPair != keyValuePairs.end(); ++itPair)
{

12
Source/cmMakefile.cxx
View File

@ -4344,6 +4344,18 @@ bool cmMakefile::GetPropertyAsBool(const std::string& prop) const
return cmSystemTools::IsOn(this->GetProperty(prop));
}
std::vector<std::string> cmMakefile::GetPropertyKeys() const
{
std::vector<std::string> keys;
keys.reserve(this->Properties.size());
for(cmPropertyMap::const_iterator it = this->Properties.begin();
it != this->Properties.end(); ++it)
{
keys.push_back(it->first);
}
return keys;
}
cmTarget* cmMakefile::FindTarget(const std::string& name,
bool excludeAliases) const
{

4
Source/cmMakefile.h
View File

@ -700,9 +700,7 @@ public:
const char *GetProperty(const std::string& prop) const;
const char *GetProperty(const std::string& prop, bool chain) const;
bool GetPropertyAsBool(const std::string& prop) const;
// Get the properties
cmPropertyMap &GetProperties() { return this->Properties; }
std::vector<std::string> GetPropertyKeys() const;
///! Initialize a makefile from its parent
void InitializeFromParent(cmMakefile* parent);