diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-28 17:42:41 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-28 17:43:48 (GMT) |
| commit | 9da844d8cbbd2c525265a551421dbf126ef328d1 (patch) | |
| tree | 9fd769530113738b78a66da8a6cf97089543266e /Source/cmLocalGenerator.cxx | |
| parent | 6f7c96fb178a290934b5b91c919ddff143d8b542 (diff) | |
| parent | 50fbfee3a02e7099a3909d81597f4b8047847ece (diff) | |
| download | CMake-9da844d8cbbd2c525265a551421dbf126ef328d1.zip CMake-9da844d8cbbd2c525265a551421dbf126ef328d1.tar.gz CMake-9da844d8cbbd2c525265a551421dbf126ef328d1.tar.bz2 | |
Merge topic 'lg-directory'
50fbfee3a0 cmLocalGenerator: return directories as const std::string&
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2309
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 75b7f23..532f9a9 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -2528,14 +2528,14 @@ std::string const& cmLocalGenerator::GetBinaryDirectory() const return this->GetCMakeInstance()->GetHomeOutputDirectory(); } -const char* cmLocalGenerator::GetCurrentBinaryDirectory() const +std::string const& cmLocalGenerator::GetCurrentBinaryDirectory() const { - return this->StateSnapshot.GetDirectory().GetCurrentBinary().c_str(); + return this->StateSnapshot.GetDirectory().GetCurrentBinary(); } -const char* cmLocalGenerator::GetCurrentSourceDirectory() const +std::string const& cmLocalGenerator::GetCurrentSourceDirectory() const { - return this->StateSnapshot.GetDirectory().GetCurrentSource().c_str(); + return this->StateSnapshot.GetDirectory().GetCurrentSource(); } std::string cmLocalGenerator::GetTargetDirectory( |