diff options
| author | David Cole <david.cole@kitware.com> | 2010-11-23 21:12:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-11-23 21:12:24 (GMT) |
| commit | 5b00b2a2018cfd3fdb52185e8c4852dc0c50fc89 (patch) | |
| tree | 0199af3f6c367e28eb586e09b15af6a0072a711d /Source/cmake.cxx | |
| parent | bc43385d23159037fa7c15790faafbf585a13e97 (diff) | |
| parent | 8b143fab66a2d1e93bf01eb7837a33e52644c396 (diff) | |
| download | CMake-5b00b2a2018cfd3fdb52185e8c4852dc0c50fc89.zip CMake-5b00b2a2018cfd3fdb52185e8c4852dc0c50fc89.tar.gz CMake-5b00b2a2018cfd3fdb52185e8c4852dc0c50fc89.tar.bz2 | |
Merge topic 'dev/fix-cache-variable-parsing-ambiguity'
8b143fa Condense parsing of cache entries
122ebf1 Support manual cache entries
90abc3a Use cmCacheManager to load entries from the cache
6fe8624 Fix parsing of cache variables without a type
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index aec8e06..ddfdc24 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -363,8 +363,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); |