diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-04-16 21:33:09 +0200 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-04-21 00:12:52 +0200 |
| commit | 54d6a9187f24bbff9e344d8aa6b3c0d66167094d (patch) | |
| tree | 38e6b82b92d62335a89cdc5b59835cc94c33f052 /Source/cmQTWrapUICommand.cxx | |
| parent | 55d80d0a8557189400bc12c5e577702a4d03b2e6 (diff) | |
| download | cmake-54d6a9187f24bbff9e344d8aa6b3c0d66167094d.tar.gz | |
cmMakefile: Rename GetCurrent{Output,Binary}Directory.
Match names used in CMake code.
Diffstat (limited to 'Source/cmQTWrapUICommand.cxx')
| -rw-r--r-- | Source/cmQTWrapUICommand.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmQTWrapUICommand.cxx b/Source/cmQTWrapUICommand.cxx index b1e43b84e3..3adea2967f 100644 --- a/Source/cmQTWrapUICommand.cxx +++ b/Source/cmQTWrapUICommand.cxx @@ -46,15 +46,15 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& args, // Compute the name of the files to generate. std::string srcName = cmSystemTools::GetFilenameWithoutLastExtension(*j); - std::string hName = this->Makefile->GetCurrentOutputDirectory(); + std::string hName = this->Makefile->GetCurrentBinaryDirectory(); hName += "/"; hName += srcName; hName += ".h"; - std::string cxxName = this->Makefile->GetCurrentOutputDirectory(); + std::string cxxName = this->Makefile->GetCurrentBinaryDirectory(); cxxName += "/"; cxxName += srcName; cxxName += ".cxx"; - std::string mocName = this->Makefile->GetCurrentOutputDirectory(); + std::string mocName = this->Makefile->GetCurrentBinaryDirectory(); mocName += "/moc_"; mocName += srcName; mocName += ".cxx"; @@ -69,7 +69,7 @@ bool cmQTWrapUICommand::InitialPass(std::vector<std::string> const& args, { if(curr && curr->GetPropertyAsBool("GENERATED")) { - uiName = this->Makefile->GetCurrentOutputDirectory(); + uiName = this->Makefile->GetCurrentBinaryDirectory(); } else { |