kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmCustomCommandGenerator: Port to cmOutputConverter.

This commit is contained in:
Stephen Kelly 2015-06-04 19:47:37 +02:00
parent 0f2a132437
commit 2f1bd62b23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmCustomCommandGenerator.cxx
View File

@ -13,13 +13,13 @@
#include "cmMakefile.h" #include "cmMakefile.h"
#include "cmCustomCommand.h" #include "cmCustomCommand.h"
#include "cmLocalGenerator.h" #include "cmOutputConverter.h"
#include "cmGeneratorExpression.h" #include "cmGeneratorExpression.h"
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmCustomCommandGenerator::cmCustomCommandGenerator( cmCustomCommandGenerator::cmCustomCommandGenerator(
cmCustomCommand const& cc, const std::string& config, cmMakefile* mf): cmCustomCommand const& cc, const std::string& config, cmMakefile* mf):
CC(cc), Config(config), Makefile(mf), LG(mf->GetLocalGenerator()), CC(cc), Config(config), Makefile(mf),
OldStyle(cc.GetEscapeOldStyle()), MakeVars(cc.GetEscapeAllowMakeVars()), OldStyle(cc.GetEscapeOldStyle()), MakeVars(cc.GetEscapeAllowMakeVars()),
GE(new cmGeneratorExpression(&cc.GetBacktrace())), DependsDone(false) GE(new cmGeneratorExpression(&cc.GetBacktrace())), DependsDone(false)
{ {
@ -96,7 +96,8 @@ cmCustomCommandGenerator
} }
else else
{ {
cmd += this->LG->EscapeForShell(arg, this->MakeVars); cmOutputConverter converter(this->Makefile->GetStateSnapshot());
cmd += converter.EscapeForShell(arg, this->MakeVars);
} }
} }
} }

2
Source/cmCustomCommandGenerator.h
View File

@ -16,7 +16,6 @@
class cmCustomCommand; class cmCustomCommand;
class cmMakefile; class cmMakefile;
class cmLocalGenerator;
class cmGeneratorExpression; class cmGeneratorExpression;
class cmCustomCommandGenerator class cmCustomCommandGenerator
@ -24,7 +23,6 @@ class cmCustomCommandGenerator
cmCustomCommand const& CC; cmCustomCommand const& CC;
std::string Config; std::string Config;
cmMakefile* Makefile; cmMakefile* Makefile;
cmLocalGenerator* LG;
bool OldStyle; bool OldStyle;
bool MakeVars; bool MakeVars;
cmGeneratorExpression* GE; cmGeneratorExpression* GE;