summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2012-09-15 19:34:17 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-10-30 21:41:51 (GMT)
commitcfb666133378d723a046ab7a4463a590deaa7aee (patch)
tree24355f9611b1da3f5412867aef146c972d37f54a /Source
parent8a6e82724c42920855c2348e914636f52a0c55d5 (diff)
downloadCMake-cfb666133378d723a046ab7a4463a590deaa7aee.zip
CMake-cfb666133378d723a046ab7a4463a590deaa7aee.tar.gz
CMake-cfb666133378d723a046ab7a4463a590deaa7aee.tar.bz2
Don't call SetProperty from GetProperty.
Memoize with the internal container directly instead.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmTarget.cxx14
1 files changed, 10 insertions, 4 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 6d6d2d8..85ee6d2 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2907,7 +2907,8 @@ const char *cmTarget::GetProperty(const char* prop,
// cannot take into account the per-configuration name of the
// target because the configuration type may not be known at
// CMake time.
- this->SetProperty("LOCATION", this->GetLocation(0));
+ this->Properties.SetProperty("LOCATION", this->GetLocation(0),
+ cmProperty::TARGET);
}
// Support "LOCATION_<CONFIG>".
@@ -2918,7 +2919,9 @@ const char *cmTarget::GetProperty(const char* prop,
return 0;
}
std::string configName = prop+9;
- this->SetProperty(prop, this->GetLocation(configName.c_str()));
+ this->Properties.SetProperty(prop,
+ this->GetLocation(configName.c_str()),
+ cmProperty::TARGET);
}
else
{
@@ -2933,7 +2936,9 @@ const char *cmTarget::GetProperty(const char* prop,
{
return 0;
}
- this->SetProperty(prop, this->GetLocation(configName.c_str()));
+ this->Properties.SetProperty(prop,
+ this->GetLocation(configName.c_str()),
+ cmProperty::TARGET);
}
}
}
@@ -3038,7 +3043,8 @@ const char *cmTarget::GetProperty(const char* prop,
// Append this list entry.
ss << sname;
}
- this->SetProperty("SOURCES", ss.str().c_str());
+ this->Properties.SetProperty("SOURCES", ss.str().c_str(),
+ cmProperty::TARGET);
}
// the type property returns what type the target is