diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-28 16:34:30 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-28 16:34:30 (GMT) |
| commit | af3463972426b24cde2b88f3ba1af1071c5dc3ff (patch) | |
| tree | 56761938fc855a0d93a77f779a0cf499b4b1a012 /Source | |
| parent | 960f140d19c9432f5e901cc2a1f24725f6fbc83e (diff) | |
| parent | 1cd375272997cb58f0c51647cf199e4fd4eef678 (diff) | |
| download | CMake-af3463972426b24cde2b88f3ba1af1071c5dc3ff.zip CMake-af3463972426b24cde2b88f3ba1af1071c5dc3ff.tar.gz CMake-af3463972426b24cde2b88f3ba1af1071c5dc3ff.tar.bz2 | |
Merge topic 'fix-cache-self-assignment'
1cd37527 cmCacheManager: Avoid cache entry self-assignment
326d15a3 cmake: Tolerate missing HELPSTRING on compiler change
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCacheManager.cxx | 6 | ||||
| -rw-r--r-- | Source/cmake.cxx | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 8f352b1..d6b84a0 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -751,11 +751,7 @@ void cmCacheManager::AddCacheEntry(const std::string& key, } e.SetProperty("HELPSTRING", helpString? helpString : "(This variable does not exist and should not be used)"); - if (this->Cache[key].Value == e.Value) - { - this->CMakeInstance->UnwatchUnusedCli(key); - } - this->Cache[key] = e; + this->CMakeInstance->UnwatchUnusedCli(key); } bool cmCacheManager::CacheIterator::IsAtEnd() const diff --git a/Source/cmake.cxx b/Source/cmake.cxx index a83ebd5..976bf44 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1236,7 +1236,10 @@ int cmake::HandleDeleteCacheVariables(const std::string& var) if(ci.Find(save.key)) { save.type = ci.GetType(); - save.help = ci.GetProperty("HELPSTRING"); + if(const char* help = ci.GetProperty("HELPSTRING")) + { + save.help = help; + } } saved.push_back(save); } |