diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-28 17:42:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-28 17:42:43 (GMT) |
| commit | 6f7c96fb178a290934b5b91c919ddff143d8b542 (patch) | |
| tree | 4f7b80f56fd419a829d6ccb282b833604efa83f7 /Source/cmMakefile.cxx | |
| parent | c549deed7fc6dec2c3f5f3ab5f9ded1acb916239 (diff) | |
| parent | c8fd23ec6f33eef8cf11d81938c379590080bd19 (diff) | |
| download | CMake-6f7c96fb178a290934b5b91c919ddff143d8b542.zip CMake-6f7c96fb178a290934b5b91c919ddff143d8b542.tar.gz CMake-6f7c96fb178a290934b5b91c919ddff143d8b542.tar.bz2 | |
Merge topic 'mk-directory'
c8fd23ec6f cmMakefile: return directories as const std::string&
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2311
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 9e14917..6127b57 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1635,14 +1635,14 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath, } } -const char* cmMakefile::GetCurrentSourceDirectory() const +const std::string& cmMakefile::GetCurrentSourceDirectory() const { - return this->StateSnapshot.GetDirectory().GetCurrentSource().c_str(); + return this->StateSnapshot.GetDirectory().GetCurrentSource(); } -const char* cmMakefile::GetCurrentBinaryDirectory() const +const std::string& cmMakefile::GetCurrentBinaryDirectory() const { - return this->StateSnapshot.GetDirectory().GetCurrentBinary().c_str(); + return this->StateSnapshot.GetDirectory().GetCurrentBinary(); } std::vector<cmTarget*> cmMakefile::GetImportedTargets() const |