diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2018-08-24 17:58:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-08-27 18:07:43 (GMT) |
| commit | c8fd23ec6f33eef8cf11d81938c379590080bd19 (patch) | |
| tree | 75a04f4a2a037ededbee0a92628c103af03fc816 /Source/cmSubdirCommand.cxx | |
| parent | 0897c3cf585853358ef7ec2bd180dbb2e3288b21 (diff) | |
| download | CMake-c8fd23ec6f33eef8cf11d81938c379590080bd19.zip CMake-c8fd23ec6f33eef8cf11d81938c379590080bd19.tar.gz CMake-c8fd23ec6f33eef8cf11d81938c379590080bd19.tar.bz2 | |
cmMakefile: return directories as const std::string&
Diffstat (limited to 'Source/cmSubdirCommand.cxx')
| -rw-r--r-- | Source/cmSubdirCommand.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmSubdirCommand.cxx b/Source/cmSubdirCommand.cxx index c74ca59..9d36228 100644 --- a/Source/cmSubdirCommand.cxx +++ b/Source/cmSubdirCommand.cxx @@ -30,18 +30,17 @@ bool cmSubdirCommand::InitialPass(std::vector<std::string> const& args, // if they specified a relative path then compute the full std::string srcPath = - std::string(this->Makefile->GetCurrentSourceDirectory()) + "/" + i; + this->Makefile->GetCurrentSourceDirectory() + "/" + i; if (cmSystemTools::FileIsDirectory(srcPath)) { std::string binPath = - std::string(this->Makefile->GetCurrentBinaryDirectory()) + "/" + i; + this->Makefile->GetCurrentBinaryDirectory() + "/" + i; this->Makefile->AddSubDirectory(srcPath, binPath, excludeFromAll, false); } // otherwise it is a full path else if (cmSystemTools::FileIsDirectory(i)) { // we must compute the binPath from the srcPath, we just take the last // element from the source path and use that - std::string binPath = - std::string(this->Makefile->GetCurrentBinaryDirectory()) + "/" + + std::string binPath = this->Makefile->GetCurrentBinaryDirectory() + "/" + cmSystemTools::GetFilenameName(i); this->Makefile->AddSubDirectory(i, binPath, excludeFromAll, false); } else { |