summaryrefslogtreecommitdiffstats
path: root/Source/cmSetPropertyCommand.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-04-06 08:52:45 (GMT)
committerBrad King <brad.king@kitware.com>2015-04-13 15:44:15 (GMT)
commitff7169a03c2ae2e7a0440c1f2921b7ce6b2e486c (patch)
tree5154d25dbe57edfed146b7d956487a7b1250b2ef /Source/cmSetPropertyCommand.cxx
parenta6b1ad1309d14668e572da7937a2a8dda9e1f669 (diff)
downloadCMake-ff7169a03c2ae2e7a0440c1f2921b7ce6b2e486c.zip
CMake-ff7169a03c2ae2e7a0440c1f2921b7ce6b2e486c.tar.gz
CMake-ff7169a03c2ae2e7a0440c1f2921b7ce6b2e486c.tar.bz2
Port to cmState.
Diffstat (limited to 'Source/cmSetPropertyCommand.cxx')
-rw-r--r--Source/cmSetPropertyCommand.cxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/cmSetPropertyCommand.cxx b/Source/cmSetPropertyCommand.cxx
index 77f9fb9..08de585 100644
--- a/Source/cmSetPropertyCommand.cxx
+++ b/Source/cmSetPropertyCommand.cxx
@@ -453,7 +453,7 @@ bool cmSetPropertyCommand::HandleCacheMode()
cmMakefile* mf = this->GetMakefile();
cmake* cm = mf->GetCMakeInstance();
const char* existingValue
- = cm->GetCacheManager()->GetCacheEntryValue(*ni);
+ = cm->GetState()->GetCacheEntryValue(*ni);
if(existingValue)
{
if(!this->HandleCacheEntry(*ni))
@@ -479,20 +479,19 @@ bool cmSetPropertyCommand::HandleCacheEntry(std::string const& cacheKey)
// Set or append the property.
const char* name = this->PropertyName.c_str();
const char* value = this->PropertyValue.c_str();
- cmCacheManager* manager = this->Makefile->GetCacheManager();
+ cmState* state = this->Makefile->GetState();
if (this->Remove)
{
- manager->RemoveCacheEntryProperty(cacheKey, name);
- return true;
+ state->RemoveCacheEntryProperty(cacheKey, name);
}
if(this->AppendMode)
{
- manager->AppendCacheEntryProperty(cacheKey, name, value,
- this->AppendAsString);
+ state->AppendCacheEntryProperty(cacheKey, name, value,
+ this->AppendAsString);
}
else
{
- manager->SetCacheEntryProperty(cacheKey, name, value);
+ state->SetCacheEntryProperty(cacheKey, name, value);
}
return true;