summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2010-11-22 20:45:30 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2010-11-22 20:45:30 (GMT)
commit8b143fab66a2d1e93bf01eb7837a33e52644c396 (patch)
treeb51ea8952d7e381dadaa849ef3669b1185dc9c14 /Source/cmake.cxx
parent122ebf12976ce370d78aa14594baf39f30b5c9ee (diff)
downloadCMake-8b143fab66a2d1e93bf01eb7837a33e52644c396.zip
CMake-8b143fab66a2d1e93bf01eb7837a33e52644c396.tar.gz
CMake-8b143fab66a2d1e93bf01eb7837a33e52644c396.tar.bz2
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/cmake.cxx')
-rw-r--r--Source/cmake.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 2ebd165..e332955 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -362,8 +362,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args)
}
std::string var, value;
cmCacheManager::CacheEntryType type = cmCacheManager::UNINITIALIZED;
- if(cmCacheManager::ParseEntry(entry.c_str(), var, value, type) ||
- cmCacheManager::ParseEntry(entry.c_str(), var, value))
+ if(cmCacheManager::ParseEntry(entry.c_str(), var, value, type))
{
this->CacheManager->AddCacheEntry(var.c_str(), value.c_str(),
"No help, variable specified on the command line.", type);