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

Merge topic 'fix-cache-self-assignment'

Browse Source 
1cd37527 cmCacheManager: Avoid cache entry self-assignment
326d15a3 cmake: Tolerate missing HELPSTRING on compiler change
This commit is contained in:
Brad King 2014-05-28 12:34:30 -04:00 committed by CMake Topic Stage
commit af34639724
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmCacheManager.cxx
View File

@ -751,11 +751,7 @@ void cmCacheManager::AddCacheEntry(const std::string& key,
} }
e.SetProperty("HELPSTRING", helpString? helpString : e.SetProperty("HELPSTRING", helpString? helpString :
"(This variable does not exist and should not be used)"); "(This variable does not exist and should not be used)");
if (this->Cache[key].Value == e.Value) this->CMakeInstance->UnwatchUnusedCli(key);
{
this->CMakeInstance->UnwatchUnusedCli(key);
}
this->Cache[key] = e;
} }
bool cmCacheManager::CacheIterator::IsAtEnd() const bool cmCacheManager::CacheIterator::IsAtEnd() const

5
Source/cmake.cxx
View File

@ -1236,7 +1236,10 @@ int cmake::HandleDeleteCacheVariables(const std::string& var)
if(ci.Find(save.key)) if(ci.Find(save.key))
{ {
save.type = ci.GetType(); save.type = ci.GetType();
save.help = ci.GetProperty("HELPSTRING"); if(const char* help = ci.GetProperty("HELPSTRING"))
{
save.help = help;
}
} }
saved.push_back(save); saved.push_back(save);
} }