summaryrefslogtreecommitdiffstats
path: root/Source/cmTestGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2012-11-19 18:30:56 (GMT)
committerStephen Kelly <steveire@gmail.com>2012-12-20 11:17:37 (GMT)
commit76ea420fb9a8ceada0e806f1201230e5a7c1202c (patch)
tree3cb2ec0d1a5470a1a76d426e1fabfb5bc53fc2f3 /Source/cmTestGenerator.cxx
parent5ac16ea6e4ddb086d48c97fa4f58543284ec3305 (diff)
downloadCMake-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/cmTestGenerator.cxx')
-rw-r--r--Source/cmTestGenerator.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 2f650e7..42f511e 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -112,7 +112,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
else
{
// Use the command name given.
- exe = ge.Parse(exe.c_str()).Evaluate(mf, config);
+ exe = ge.Parse(exe.c_str())->Evaluate(mf, config);
cmSystemTools::ConvertToUnixSlashes(exe);
}
@@ -122,7 +122,7 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream& os,
for(std::vector<std::string>::const_iterator ci = command.begin()+1;
ci != command.end(); ++ci)
{
- os << " " << lg->EscapeForCMake(ge.Parse(*ci).Evaluate(mf, config));
+ os << " " << lg->EscapeForCMake(ge.Parse(*ci)->Evaluate(mf, config));
}
// Finish the test command.