Merge branch 'fix-cache-self-assignment' into release
This commit is contained in:
commit
61a1612a17
|
@ -750,11 +750,7 @@ void cmCacheManager::AddCacheEntry(const char* 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
|
||||||
|
|
|
@ -1231,7 +1231,10 @@ int cmake::HandleDeleteCacheVariables(const char* var)
|
||||||
if(ci.Find(save.key.c_str()))
|
if(ci.Find(save.key.c_str()))
|
||||||
{
|
{
|
||||||
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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue