summaryrefslogtreecommitdiff
path: root/Source/cmLoadCacheCommand.cxx
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2010-11-22 15:45:30 -0500
committerBen Boeckel <ben.boeckel@kitware.com>2010-11-22 15:45:30 -0500
commit8b143fab66a2d1e93bf01eb7837a33e52644c396 (patch)
treeb51ea8952d7e381dadaa849ef3669b1185dc9c14 /Source/cmLoadCacheCommand.cxx
parent122ebf12976ce370d78aa14594baf39f30b5c9ee (diff)
downloadcmake-8b143fab66a2d1e93bf01eb7837a33e52644c396.tar.gz
Condense parsing of cache entries
If a cache line is being parsed, it shouldn't matter whether it has a type or not; just parse it however possible.
Diffstat (limited to 'Source/cmLoadCacheCommand.cxx')
-rw-r--r--Source/cmLoadCacheCommand.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmLoadCacheCommand.cxx b/Source/cmLoadCacheCommand.cxx
index b06e2f9fb2..a239e55bf8 100644
--- a/Source/cmLoadCacheCommand.cxx
+++ b/Source/cmLoadCacheCommand.cxx
@@ -175,8 +175,7 @@ void cmLoadCacheCommand::CheckLine(const char* line)
std::string var;
std::string value;
cmCacheManager::CacheEntryType type = cmCacheManager::UNINITIALIZED;
- if(cmCacheManager::ParseEntry(line, var, value, type) ||
- cmCacheManager::ParseEntry(line, var, value))
+ if(cmCacheManager::ParseEntry(line, var, value, type))
{
// Found a real entry. See if this one was requested.
if(this->VariablesToRead.find(var) != this->VariablesToRead.end())