diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-11-19 18:30:56 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-12-20 11:17:37 (GMT) |
| commit | 76ea420fb9a8ceada0e806f1201230e5a7c1202c (patch) | |
| tree | 3cb2ec0d1a5470a1a76d426e1fabfb5bc53fc2f3 /Source/cmCustomCommandGenerator.cxx | |
| parent | 5ac16ea6e4ddb086d48c97fa4f58543284ec3305 (diff) | |
| download | CMake-76ea420fb9a8ceada0e806f1201230e5a7c1202c.zip CMake-76ea420fb9a8ceada0e806f1201230e5a7c1202c.tar.gz CMake-76ea420fb9a8ceada0e806f1201230e5a7c1202c.tar.bz2 | |
Use cmsys::auto_ptr to manage cmCompiledGeneratorExpressions
The compiled generator expressions need to outlive the creating
type. For the same reason, store the input string in a std::string.
Diffstat (limited to 'Source/cmCustomCommandGenerator.cxx')
| -rw-r--r-- | Source/cmCustomCommandGenerator.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx index 07df7d5..f2f77ee 100644 --- a/Source/cmCustomCommandGenerator.cxx +++ b/Source/cmCustomCommandGenerator.cxx @@ -47,7 +47,7 @@ std::string cmCustomCommandGenerator::GetCommand(unsigned int c) const { return target->GetLocation(this->Config); } - return this->GE->Parse(argv0).Evaluate(this->Makefile, this->Config); + return this->GE->Parse(argv0)->Evaluate(this->Makefile, this->Config); } //---------------------------------------------------------------------------- @@ -58,7 +58,7 @@ cmCustomCommandGenerator cmCustomCommandLine const& commandLine = this->CC.GetCommandLines()[c]; for(unsigned int j=1;j < commandLine.size(); ++j) { - std::string arg = this->GE->Parse(commandLine[j]).Evaluate(this->Makefile, + std::string arg = this->GE->Parse(commandLine[j])->Evaluate(this->Makefile, this->Config); cmd += " "; if(this->OldStyle) |