diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-01-18 16:10:03 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-02-05 19:44:25 (GMT) |
commit | bd990c803b40e1532cab6b29c75414ca6f30e782 (patch) | |
tree | 6e724661a3b4e195b3d437cf11053f797b8d9bcf /Source/cmQTWrapCPPCommand.cxx | |
parent | 5fc53f1edb2d003595ef224b31a805c3af0dc0e6 (diff) | |
download | CMake-bd990c803b40e1532cab6b29c75414ca6f30e782.zip CMake-bd990c803b40e1532cab6b29c75414ca6f30e782.tar.gz CMake-bd990c803b40e1532cab6b29c75414ca6f30e782.tar.bz2 |
Remove use of ExpandSourceListArguments.
By now, it is only an expensive copy.
Diffstat (limited to 'Source/cmQTWrapCPPCommand.cxx')
-rw-r--r-- | Source/cmQTWrapCPPCommand.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/cmQTWrapCPPCommand.cxx b/Source/cmQTWrapCPPCommand.cxx index a984260..878562c 100644 --- a/Source/cmQTWrapCPPCommand.cxx +++ b/Source/cmQTWrapCPPCommand.cxx @@ -12,19 +12,15 @@ #include "cmQTWrapCPPCommand.h" // cmQTWrapCPPCommand -bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn, +bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) { - if(argsIn.size() < 3 ) + if(args.size() < 3 ) { this->SetError("called with incorrect number of arguments"); return false; } - // This command supports source list inputs for compatibility. - std::vector<std::string> args; - this->Makefile->ExpandSourceListArguments(argsIn, args, 2); - // Get the moc executable to run in the custom command. const char* moc_exe = this->Makefile->GetRequiredDefinition("QT_MOC_EXECUTABLE"); @@ -35,7 +31,7 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& argsIn, this->Makefile->GetSafeDefinition(sourceList); // Create a rule for all sources listed. - for(std::vector<std::string>::iterator j = (args.begin() + 2); + for(std::vector<std::string>::const_iterator j = (args.begin() + 2); j != args.end(); ++j) { cmSourceFile *curr = this->Makefile->GetSource(*j); |