diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-04 17:47:37 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-06-06 07:15:57 (GMT) |
| commit | 2f1bd62b2308c234b5c4bc749afa27c7b616bdf1 (patch) | |
| tree | c6bd5e5d70d4f22566602b2640e7f6b46eda5085 /Source | |
| parent | 0f2a132437d7a553e20cc0427279c212b428e55d (diff) | |
| download | CMake-2f1bd62b2308c234b5c4bc749afa27c7b616bdf1.zip CMake-2f1bd62b2308c234b5c4bc749afa27c7b616bdf1.tar.gz CMake-2f1bd62b2308c234b5c4bc749afa27c7b616bdf1.tar.bz2 | |
cmCustomCommandGenerator: Port to cmOutputConverter.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmCustomCommandGenerator.cxx | 7 | ||||
| -rw-r--r-- | Source/cmCustomCommandGenerator.h | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx index d23f815..11308c6 100644 --- a/Source/cmCustomCommandGenerator.cxx +++ b/Source/cmCustomCommandGenerator.cxx @@ -13,13 +13,13 @@ #include "cmMakefile.h" #include "cmCustomCommand.h" -#include "cmLocalGenerator.h" +#include "cmOutputConverter.h" #include "cmGeneratorExpression.h" //---------------------------------------------------------------------------- cmCustomCommandGenerator::cmCustomCommandGenerator( 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()), GE(new cmGeneratorExpression(&cc.GetBacktrace())), DependsDone(false) { @@ -96,7 +96,8 @@ cmCustomCommandGenerator } else { - cmd += this->LG->EscapeForShell(arg, this->MakeVars); + cmOutputConverter converter(this->Makefile->GetStateSnapshot()); + cmd += converter.EscapeForShell(arg, this->MakeVars); } } } diff --git a/Source/cmCustomCommandGenerator.h b/Source/cmCustomCommandGenerator.h index b4ae014..7ad95d1 100644 --- a/Source/cmCustomCommandGenerator.h +++ b/Source/cmCustomCommandGenerator.h @@ -16,7 +16,6 @@ class cmCustomCommand; class cmMakefile; -class cmLocalGenerator; class cmGeneratorExpression; class cmCustomCommandGenerator @@ -24,7 +23,6 @@ class cmCustomCommandGenerator cmCustomCommand const& CC; std::string Config; cmMakefile* Makefile; - cmLocalGenerator* LG; bool OldStyle; bool MakeVars; cmGeneratorExpression* GE; |