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/cmLocalGenerator.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/cmLocalGenerator.cxx')
-rw-r--r-- | Source/cmLocalGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 5e47b91..d3544c5 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -423,7 +423,7 @@ void cmLocalGenerator::GenerateInstallRules() // Create the install script file. std::string file = this->Makefile->GetStartOutputDirectory(); std::string homedir = this->Makefile->GetHomeOutputDirectory(); - std::string currdir = this->Makefile->GetCurrentOutputDirectory(); + std::string currdir = this->Makefile->GetCurrentBinaryDirectory(); cmSystemTools::ConvertToUnixSlashes(file); cmSystemTools::ConvertToUnixSlashes(homedir); cmSystemTools::ConvertToUnixSlashes(currdir); @@ -669,12 +669,12 @@ void cmLocalGenerator::AddBuildTargetRule(const std::string& llang, !sf->GetPropertyAsBool("EXTERNAL_OBJECT")) { std::string dir_max; - dir_max += this->Makefile->GetCurrentOutputDirectory(); + dir_max += this->Makefile->GetCurrentBinaryDirectory(); dir_max += "/"; std::string obj = this->GetObjectFileNameWithoutTarget(*sf, dir_max); if(!obj.empty()) { - std::string ofname = this->Makefile->GetCurrentOutputDirectory(); + std::string ofname = this->Makefile->GetCurrentBinaryDirectory(); ofname += "/"; ofname += obj; objVector.push_back(ofname); |