diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-16 19:33:09 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-20 22:12:52 (GMT) |
| commit | 54d6a9187f24bbff9e344d8aa6b3c0d66167094d (patch) | |
| tree | 38e6b82b92d62335a89cdc5b59835cc94c33f052 /Source/cmSubdirCommand.cxx | |
| parent | 55d80d0a8557189400bc12c5e577702a4d03b2e6 (diff) | |
| download | CMake-54d6a9187f24bbff9e344d8aa6b3c0d66167094d.zip CMake-54d6a9187f24bbff9e344d8aa6b3c0d66167094d.tar.gz CMake-54d6a9187f24bbff9e344d8aa6b3c0d66167094d.tar.bz2 | |
cmMakefile: Rename GetCurrent{Output,Binary}Directory.
Match names used in CMake code.
Diffstat (limited to 'Source/cmSubdirCommand.cxx')
| -rw-r--r-- | Source/cmSubdirCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmSubdirCommand.cxx b/Source/cmSubdirCommand.cxx index 47198a3..6a4a835 100644 --- a/Source/cmSubdirCommand.cxx +++ b/Source/cmSubdirCommand.cxx @@ -44,7 +44,7 @@ bool cmSubdirCommand if (cmSystemTools::FileIsDirectory(srcPath)) { std::string binPath = - std::string(this->Makefile->GetCurrentOutputDirectory()) + + std::string(this->Makefile->GetCurrentBinaryDirectory()) + "/" + i->c_str(); this->Makefile->AddSubDirectory(srcPath, binPath, excludeFromAll, false); @@ -55,7 +55,7 @@ bool cmSubdirCommand // 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->GetCurrentOutputDirectory()) + + std::string(this->Makefile->GetCurrentBinaryDirectory()) + "/" + cmSystemTools::GetFilenameName(*i); this->Makefile->AddSubDirectory(*i, binPath, excludeFromAll, false); |