summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.cxx
diff options
context:
space:
mode:
authorCraig Scott <craig.scott@crascit.com>2018-08-13 21:12:28 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-08-13 21:12:37 (GMT)
commit0eb4b0bb7b2f7a82b3645907a5c02e57653afa8e (patch)
tree988efa12c4160ee7a76a6038322918f578e8231a /Source/cmTarget.cxx
parentcd8b094d1dacbff2fa5e520ca167d6f1880310f9 (diff)
parentada121e573fb1a4c2d4ea5ee2ee51daca80d4de8 (diff)
downloadCMake-0eb4b0bb7b2f7a82b3645907a5c02e57653afa8e.zip
CMake-0eb4b0bb7b2f7a82b3645907a5c02e57653afa8e.tar.gz
CMake-0eb4b0bb7b2f7a82b3645907a5c02e57653afa8e.tar.bz2
Merge topic 'state-directory-stdstring'
ada121e573 cmStateDirectory: use const std::string& for return values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2277
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r--Source/cmTarget.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 380ac88..cc5a176 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -1415,13 +1415,15 @@ const char* cmTarget::GetProperty(const std::string& prop) const
return this->GetMakefile()
->GetStateSnapshot()
.GetDirectory()
- .GetCurrentBinary();
+ .GetCurrentBinary()
+ .c_str();
}
if (prop == propSOURCE_DIR) {
return this->GetMakefile()
->GetStateSnapshot()
.GetDirectory()
- .GetCurrentSource();
+ .GetCurrentSource()
+ .c_str();
}
}