diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-21 19:03:02 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-21 19:03:02 (GMT) |
| commit | 533f5a20372829aa41a71ed4698cac2a50820a7e (patch) | |
| tree | 076562bbb762e4fc61c0bce10a13b02528e0fcbe /Source/cmLocalVisualStudio6Generator.cxx | |
| parent | ea38628366634189502b57c53d866bc436eb7c7f (diff) | |
| parent | 53ea8b32045ce4c8045b904407e7e57d8d9fd4ab (diff) | |
| download | CMake-533f5a20372829aa41a71ed4698cac2a50820a7e.zip CMake-533f5a20372829aa41a71ed4698cac2a50820a7e.tar.gz CMake-533f5a20372829aa41a71ed4698cac2a50820a7e.tar.bz2 | |
Merge topic 'custom-command-refactor'
53ea8b3 Merge branch 'imported-target-dependencies' into custom-command-refactor
1a29cca Remove cmLocalGenerator::GetRealLocation
542b517 Factor out common custom command generator
6fe5b3d Simplify VS generator ConstructScript interface
Diffstat (limited to 'Source/cmLocalVisualStudio6Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio6Generator.cxx | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx index b50c133..851c526 100644 --- a/Source/cmLocalVisualStudio6Generator.cxx +++ b/Source/cmLocalVisualStudio6Generator.cxx @@ -65,13 +65,7 @@ public: { this->Code += "\\\n\t"; } - this->Code += - this->LG->ConstructScript(cc.GetCommandLines(), - cc.GetWorkingDirectory(), - this->Config, - cc.GetEscapeOldStyle(), - cc.GetEscapeAllowMakeVars(), - "\\\n\t"); + this->Code += this->LG->ConstructScript(cc, this->Config, "\\\n\t"); } private: cmLocalVisualStudio6Generator* LG; @@ -659,12 +653,7 @@ cmLocalVisualStudio6Generator { std::string config = this->GetConfigName(*i); std::string script = - this->ConstructScript(command.GetCommandLines(), - command.GetWorkingDirectory(), - config.c_str(), - command.GetEscapeOldStyle(), - command.GetEscapeAllowMakeVars(), - "\\\n\t"); + this->ConstructScript(command, config.c_str(), "\\\n\t"); if (i == this->Configurations.begin()) { |