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

Use cmCacheManager to load entries from the cache

Browse Source
This commit is contained in:
Ben Boeckel 2010-11-22 15:14:21 -05:00
parent 6fe8624b7f
commit 90abc3a027
2 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Source/cmLoadCacheCommand.cxx
View File

@ -174,7 +174,9 @@ void cmLoadCacheCommand::CheckLine(const char* line)
// Check one line of the cache file. // Check one line of the cache file.
std::string var; std::string var;
std::string value; std::string value;
if(this->ParseEntry(line, var, value)) cmCacheManager::CacheEntryType type = cmCacheManager::UNINITIALIZED;
if(cmCacheManager::ParseEntry(line, var, value, type) ||
cmCacheManager::ParseEntry(line, var, value))
{ {
// Found a real entry. See if this one was requested. // Found a real entry. See if this one was requested.
if(this->VariablesToRead.find(var) != this->VariablesToRead.end()) if(this->VariablesToRead.find(var) != this->VariablesToRead.end())
@ -193,38 +195,3 @@ void cmLoadCacheCommand::CheckLine(const char* line)
} }
} }
} }
//----------------------------------------------------------------------------
bool cmLoadCacheCommand::ParseEntry(const char* entry, std::string& var,
std::string& value)
{
// input line is: key:type=value
cmsys::RegularExpression reg("^([^:]*):([^=]*)=(.*[^\t ]|[\t ]*)[\t ]*$");
// input line is: "key":type=value
cmsys::RegularExpression
regQuoted("^\"([^\"]*)\":([^=]*)=(.*[^\t ]|[\t ]*)[\t ]*$");
bool flag = false;
if(regQuoted.find(entry))
{
var = regQuoted.match(1);
value = regQuoted.match(3);
flag = true;
}
else if (reg.find(entry))
{
var = reg.match(1);
value = reg.match(3);
flag = true;
}
// if value is enclosed in single quotes ('foo') then remove them
// it is used to enclose trailing space or tab
if (flag &&
value.size() >= 2 &&
value[0] == '\'' &&
value[value.size() - 1] == '\'')
{
value = value.substr(1, value.size() - 2);
}
return flag;
}

1
Source/cmLoadCacheCommand.h
View File

@ -83,7 +83,6 @@ protected:
bool ReadWithPrefix(std::vector<std::string> const& args); bool ReadWithPrefix(std::vector<std::string> const& args);
void CheckLine(const char* line); void CheckLine(const char* line);
bool ParseEntry(const char* entry, std::string& var, std::string& value);
}; };