diff options
| author | Robert Maynard <robert.maynard@kitware.com> | 2013-01-23 19:50:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-02-19 19:42:00 (GMT) |
| commit | badb40d0f841dcfc4d098e59c5c570e73767cf68 (patch) | |
| tree | 2282c6752a6e0b04c62e4420f795a14d7dfd4d15 /Source/cmTestGenerator.cxx | |
| parent | b3ae61f8338fd3b2308de0173c34a329ba46d191 (diff) | |
| parent | 378899ce8744c2e2b43d0859234eea714dcef368 (diff) | |
| download | CMake-badb40d0f841dcfc4d098e59c5c570e73767cf68.zip CMake-badb40d0f841dcfc4d098e59c5c570e73767cf68.tar.gz CMake-badb40d0f841dcfc4d098e59c5c570e73767cf68.tar.bz2 | |
Merge branch 'master' into sublime-text-2-generator
Resolve conflict in Source/cmDocumentVariables.cxx by adding both
variables.
Diffstat (limited to 'Source/cmTestGenerator.cxx')
| -rw-r--r-- | Source/cmTestGenerator.cxx | 4 |
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. |