summaryrefslogtreecommitdiffstats
path: root/Source/cmTest.cxx
diff options
context:
space:
mode:
authorVitaly Stakhovsky <vvs31415@gitlab.org>2020-03-13 17:30:00 (GMT)
committerVitaly Stakhovsky <vvs31415@gitlab.org>2020-03-13 17:32:17 (GMT)
commit60f57d0dccb18bfcb37e6bd0c6496cc2e7996d14 (patch)
tree575fad8fdaf9dd42c0d88785a5aa6b361406fe80 /Source/cmTest.cxx
parent3766633b8a49cb24f4849721bb22a0feb9ba1f60 (diff)
downloadCMake-60f57d0dccb18bfcb37e6bd0c6496cc2e7996d14.zip
CMake-60f57d0dccb18bfcb37e6bd0c6496cc2e7996d14.tar.gz
CMake-60f57d0dccb18bfcb37e6bd0c6496cc2e7996d14.tar.bz2
cmPropertyMap: Introduce cmProp as return type for GetProperty() functions
Currently properties are usually stored internally as `std::string`. However, family of GetProperty() functions return them as `const char *` using `c_str()`. The proposed `cmProp`, typedef'ed as `const std::string *` will expose properties more naturally.
Diffstat (limited to 'Source/cmTest.cxx')
-rw-r--r--Source/cmTest.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmTest.cxx b/Source/cmTest.cxx
index 3b731cc..56c441a 100644
--- a/Source/cmTest.cxx
+++ b/Source/cmTest.cxx
@@ -34,15 +34,16 @@ void cmTest::SetCommand(std::vector<std::string> const& command)
const char* cmTest::GetProperty(const std::string& prop) const
{
- const char* retVal = this->Properties.GetPropertyValue(prop);
+ cmProp retVal = this->Properties.GetPropertyValue(prop);
if (!retVal) {
const bool chain =
this->Makefile->GetState()->IsPropertyChained(prop, cmProperty::TEST);
if (chain) {
return this->Makefile->GetProperty(prop, chain);
}
+ return nullptr;
}
- return retVal;
+ return retVal->c_str();
}
bool cmTest::GetPropertyAsBool(const std::string& prop) const