diff --git a/Source/cmCustomCommand.cxx b/Source/cmCustomCommand.cxx index 4032b08e20..7418413c6f 100644 --- a/Source/cmCustomCommand.cxx +++ b/Source/cmCustomCommand.cxx @@ -31,12 +31,12 @@ cmCustomCommand::cmCustomCommand(const cmCustomCommand& r): Byproducts(r.Byproducts), Depends(r.Depends), CommandLines(r.CommandLines), - HaveComment(r.HaveComment), + Backtrace(r.Backtrace), Comment(r.Comment), WorkingDirectory(r.WorkingDirectory), + HaveComment(r.HaveComment), EscapeAllowMakeVars(r.EscapeAllowMakeVars), EscapeOldStyle(r.EscapeOldStyle), - Backtrace(r.Backtrace), UsesTerminal(r.UsesTerminal) { } @@ -77,15 +77,13 @@ cmCustomCommand::cmCustomCommand(cmMakefile const* mf, Byproducts(byproducts), Depends(depends), CommandLines(commandLines), - HaveComment(comment?true:false), + Backtrace(), Comment(comment?comment:""), WorkingDirectory(workingDirectory?workingDirectory:""), + HaveComment(comment?true:false), EscapeAllowMakeVars(false), - EscapeOldStyle(true), - Backtrace() + EscapeOldStyle(true) { - this->EscapeOldStyle = true; - this->EscapeAllowMakeVars = false; if(mf) { this->Backtrace = mf->GetBacktrace(); diff --git a/Source/cmCustomCommand.h b/Source/cmCustomCommand.h index 0bfaef23b2..cc5501fca9 100644 --- a/Source/cmCustomCommand.h +++ b/Source/cmCustomCommand.h @@ -93,13 +93,13 @@ private: std::vector Byproducts; std::vector Depends; cmCustomCommandLines CommandLines; - bool HaveComment; - std::string Comment; - std::string WorkingDirectory; - bool EscapeAllowMakeVars; - bool EscapeOldStyle; cmListFileBacktrace Backtrace; ImplicitDependsList ImplicitDepends; + std::string Comment; + std::string WorkingDirectory; + bool HaveComment; + bool EscapeAllowMakeVars; + bool EscapeOldStyle; bool UsesTerminal; };